diff --git a/web/src/Setting.js b/web/src/Setting.js
index dcb9adbe..c1c7618e 100644
--- a/web/src/Setting.js
+++ b/web/src/Setting.js
@@ -530,7 +530,15 @@ export function isAgreementRequired(application) {
   return false;
 }
 
-export function renderAgreement(required, onClick, noStyle, layout) {
+export function isDefaultTrue(application) {
+  const agreementItem = application.signupItems.find(item => item.name === "Agreement");
+  if (isAgreementRequired(application) && agreementItem.rule === "Signin (Default True)") {
+    return true;
+  }
+  return false;
+}
+
+export function renderAgreement(required, onClick, noStyle, layout, initialValue) {
   return (
     <Form.Item
       name="agreement"
@@ -544,6 +552,7 @@ export function renderAgreement(required, onClick, noStyle, layout) {
       ]}
       {...layout}
       noStyle={noStyle}
+      initialValue={initialValue}
     >
       <Checkbox style={{float: "left"}}>
         {i18next.t("signup:Accept")}&nbsp;
diff --git a/web/src/SignupTable.js b/web/src/SignupTable.js
index 50b7b1cd..cd85dada 100644
--- a/web/src/SignupTable.js
+++ b/web/src/SignupTable.js
@@ -190,6 +190,7 @@ class SignupTable extends React.Component {
             options = [
               {id: "None", name: "None"},
               {id: "Signin", name: "Signin"},
+              {id: "Signin (Default True)", name: "Signin (Default True)"},
             ];
           }
 
diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js
index 915054b5..33343626 100644
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@@ -471,7 +471,7 @@ class LoginPage extends React.Component {
                   this.setState({
                     isTermsOfUseVisible: true,
                   });
-                }, true) : (
+                }, true, {}, Setting.isDefaultTrue(application)) : (
                   <Form.Item name="autoSignin" valuePropName="checked" noStyle>
                     <Checkbox style={{float: "left"}} disabled={!application.enablePassword}>
                       {i18next.t("login:Auto sign in")}
diff --git a/web/src/auth/SignupPage.js b/web/src/auth/SignupPage.js
index 64c3ccaa..8e2674c8 100644
--- a/web/src/auth/SignupPage.js
+++ b/web/src/auth/SignupPage.js
@@ -479,7 +479,7 @@ class SignupPage extends React.Component {
           this.setState({
             isTermsOfUseVisible: true,
           });
-        }, false, tailFormItemLayout)
+        }, false, tailFormItemLayout, Setting.isDefaultTrue(application))
       );
     }
   }