diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc
index 853453686..bc7a376eb 100644
--- a/Documentation/SOGoInstallationGuide.asciidoc
+++ b/Documentation/SOGoInstallationGuide.asciidoc
@@ -828,8 +828,6 @@ Obiously, if your users can connect without specifying a domain, let this parame
 |S |SOGoDomainAllowed
 |Parameter used to define which domains SOGo should allowed during a connection request. This parameter is an array of strings.
 
-|S |SOGoURLCreateAccount
-|Add a link below the login form and set the link using the value of this setting.
 
 |S |SOGoPasswordRecoveryEnabled
 |Boolean enable password recovery with secret question or secondary e-mail. Default value is `NO`.
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index 554ae8064..3dce05cf6 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -157,9 +157,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context);
 
 - (BOOL)isURLEncryptionEnabled;
 - (NSString *)urlEncryptionPassphrase;
-
-- (NSString *)urlCreateAccount;
-
 - (BOOL)enableMailCleaning;
 
 @end
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index 739452296..b47fbf6d6 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -1157,11 +1157,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context)
   return disableExport;
 }
 
-- (NSString *)urlCreateAccount
-{
-  return [self stringForKey: @"SOGoURLCreateAccount"];
-}
-
 - (BOOL) enableMailCleaning
 {
   return [self boolForKey: @"SOGoEnableMailCleaning"];
diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings
index 4e61e2cae..2701c2441 100644
--- a/UI/MainUI/English.lproj/Localizable.strings
+++ b/UI/MainUI/English.lproj/Localizable.strings
@@ -6,7 +6,6 @@
 "Domain" = "Domain";
 "Remember username" = "Remember username";
 "Connect" = "Connect";
-"Create an account" = "Create an account";
 
 /* Appears while authentication is in progress */
 "Authenticating" = "Authenticating";
diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings
index c896cd673..9136180cc 100644
--- a/UI/MainUI/French.lproj/Localizable.strings
+++ b/UI/MainUI/French.lproj/Localizable.strings
@@ -6,7 +6,6 @@
 "Domain" = "Domaine";
 "Remember username" = "Se souvenir de moi";
 "Connect" = "Connexion";
-"Create an account" = "Créer un compte";
 
 /* Appears while authentication is in progress */
 "Authenticating" = "Authentification en cours";
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index 93765a640..f3d54dd6f 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -1452,18 +1452,4 @@ static const NSString *kJwtKey = @"jwt";
   return [[SOGoAdmin sharedInstance] getMotd] && [[[SOGoAdmin sharedInstance] getMotd] length] > 1;
 }
 
-- (BOOL) hasUrlCreateAccount
-{
-  NSString *url;
-  url = [[SOGoSystemDefaults sharedSystemDefaults] urlCreateAccount];
-  return (url != nil && [url length] > 0);
-}
-
-- (NSString *) urlCreateAccount
-{
-  return [[SOGoSystemDefaults sharedSystemDefaults]
-                              urlCreateAccount];
-}
-
-
 @end /* SOGoRootPage */
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 1f561516c..fe4269e52 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -89,35 +89,30 @@
                       </md-input-container>
                     </div>
 
-                    <!-- DOMAINS SELECT -->
-                    <var:if condition="hasLoginDomains">
-                      <div layout="row" layout-align="start end">
-                        <md-icon>domain</md-icon>
-                              <md-input-container class="md-flex">
-                                <md-select class="md-flex" ng-model="app.creds.domain" label:placeholder="choose" ng-change="app.retrievePasswordRecoveryEnabled()">
-                                  <var:foreach list="loginDomains" item="item">
-                                    <md-option var:value="item">
-                                      <var:string value="item"/>
-                                    </md-option>
-                                  </var:foreach>
-                                </md-select>
-                              </md-input-container>
-                            </div>
-                    </var:if>
-                    
-                    <div layout="row" layout-align="center center">
-                      <md-switch class="md-accent md-hue-2"
-                                ng-model="app.creds.rememberLogin"
-                                label:arial-label="Remember username">
-                        <var:string label:value="Remember username"/>
-                      </md-switch>
-                    </div>
-                    <var:if condition="hasUrlCreateAccount">
-                      <div layout="row" layout-align="center center">
-                        <a var:href="urlCreateAccount" target="_blank" class="create-account-link"><var:string label:value="Create an account"/></a>
-                      </div>
-                    </var:if>
+                  <!-- DOMAINS SELECT -->
+                  <var:if condition="hasLoginDomains">
+                    <div layout="row" layout-align="start end">
+                      <md-icon>domain</md-icon>
+                            <md-input-container class="md-flex">
+                              <md-select class="md-flex" ng-model="app.creds.domain" label:placeholder="choose" ng-change="app.retrievePasswordRecoveryEnabled()">
+                                <var:foreach list="loginDomains" item="item">
+                                  <md-option var:value="item">
+                                    <var:string value="item"/>
+                                  </md-option>
+                                </var:foreach>
+                              </md-select>
+                            </md-input-container>
+                          </div>
+                  </var:if>
+                  
+                  <div layout="row" layout-align="center center">
+                    <md-switch class="md-accent md-hue-2"
+                              ng-model="app.creds.rememberLogin"
+                              label:arial-label="Remember username">
+                      <var:string label:value="Remember username"/>
+                    </md-switch>
                   </div>
+                </div>
 
                   <!-- Password recovery -->
                   <div layout="row" layout-align="center center" ng-if="app.passwordRecovery.passwordRecoveryEnabled">
diff --git a/UI/WebServerResources/scss/views/LoginUI.scss b/UI/WebServerResources/scss/views/LoginUI.scss
index 9d56228e0..00acadbd2 100644
--- a/UI/WebServerResources/scss/views/LoginUI.scss
+++ b/UI/WebServerResources/scss/views/LoginUI.scss
@@ -52,13 +52,6 @@ $sg-login-width: grid-step(5);
       margin-bottom: 8px;
     }
 
-    .create-account-link {
-      color: rgb(255, 255, 255);
-      font-size: 1em;
-      text-decoration: none;
-      margin-bottom: 5px;
-    }
-
     .password-lost-link {
       color: rgb(255, 255, 255);
       font-size: 0.9em;