diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Attributes.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Attributes.pm
index ae39c4a69..dba8fbed4 100644
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Attributes.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Attributes.pm
@@ -807,6 +807,13 @@ has 'portalDisplayLogout' => (
     documentation => 'Display logout tab in portal',
 );
 
+has 'portalDisplayRegister' => (
+    is            => 'rw',
+    isa           => 'Str',
+    default       => '1',
+    documentation => 'Display register button in portal',
+);
+
 has 'portalDisplayResetPassword' => (
     is            => 'rw',
     isa           => 'Str',
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/css/styles.css b/lemonldap-ng-portal/example/skins/bootstrap/css/styles.css
index 04caa5757..eb23a42ca 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/css/styles.css
+++ b/lemonldap-ng-portal/example/skins/bootstrap/css/styles.css
@@ -27,9 +27,16 @@ body {
 
 .login, .password {
   text-align: center;
-  max-width: 330px;
-  padding: 15px;
+  padding: 20px;
+}
+
+div.form {
   margin: 0 auto;
+  max-width: 330px;
+}
+
+div.actions {
+  margin: 10px 0 0 0;
 }
 
 .buttons {
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/login.tpl b/lemonldap-ng-portal/example/skins/bootstrap/login.tpl
index ce15fadc8..65ccbf8de 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/login.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/login.tpl
@@ -103,6 +103,7 @@
       <input type="hidden" name="timezone" />
       <TMPL_INCLUDE NAME="standardform.tpl">
     </form>
+
     </div>
 
   </TMPL_IF>
@@ -151,7 +152,7 @@
       <TMPL_INCLUDE NAME="checklogins.tpl">
 
       <button type="submit" class="btn btn-block btn-success">
-        <span class="glyphicon glyphicon-log-in"></span>
+        <span class="glyphicon glyphicon-log-in"></span>&nbsp;
         <lang en="Connect" fr="Se connecter" />
       </button>
 
@@ -176,7 +177,7 @@
       <div class="buttons">
       <TMPL_IF NAME="MSG"><TMPL_VAR NAME="MSG"></TMPL_IF>
         <a href="<TMPL_VAR NAME="PORTAL_URL">" class="btn btn-primary" role="button">
-          <span class="glyphicon glyphicon-home"></span>
+          <span class="glyphicon glyphicon-home"></span>&nbsp;
           <lang en="Go to portal" fr="Aller au portail" />
         </a>
       </div>
@@ -187,7 +188,7 @@
     <div id="logout">
       <div class="buttons">
         <a href="<TMPL_VAR NAME="LOGOUT_URL">" class="btn btn-danger" role="button">
-          <span class="glyphicon glyphicon-log-out"></span>
+          <span class="glyphicon glyphicon-log-out"></span>&nbps;
           <lang en="Logout" fr="Se d&eacute;connecter"/>
         </a>
       </div>
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/password.tpl b/lemonldap-ng-portal/example/skins/bootstrap/password.tpl
index b2082f0b0..842a12900 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/password.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/password.tpl
@@ -1,4 +1,5 @@
   <form action="#" method="post" class="password" role="form">
+  <div class="form">
     <TMPL_VAR NAME="HIDDEN_INPUTS">
 
     <TMPL_IF NAME="CHOICE_VALUE">
@@ -42,5 +43,5 @@
     <button type="submit" class="btn btn-block btn-success" >
       <lang en="Submit" fr="Soumettre" />
     </button>
-
+  </div>
   </form>
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl b/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl
index 592f2b5aa..49d29168c 100644
--- a/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl
+++ b/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl
@@ -1,4 +1,4 @@
-
+<div class="form">
   <div class="form-group input-group">
     <span class="input-group-addon glyphicon glyphicon-user"> </span>
     <input name="user" type="text" value="<TMPL_VAR NAME="LOGIN">" class="form-control" placeholder="<lang en="Login" fr="Identifiant"/>" required />
@@ -23,14 +23,23 @@
   <TMPL_INCLUDE NAME="checklogins.tpl">
 
   <button type="submit" class="btn btn-block btn-success" >
-    <span class="glyphicon glyphicon-log-in"></span>
+    <span class="glyphicon glyphicon-log-in"></span>&nbsp;
     <lang en="Connect" fr="Se connecter" />
   </button>
-
+</div>
+<div class="actions">
   <TMPL_IF NAME="DISPLAY_RESETPASSWORD">
-  <a class="btn btn-block btn-info" href="<TMPL_VAR NAME="MAIL_URL"><TMPL_IF NAME="key">?<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="key"></TMPL_IF>">
-    <span class="glyphicon glyphicon-info-sign"></span>
+  <a class="btn btn-info" href="<TMPL_VAR NAME="MAIL_URL"><TMPL_IF NAME="key">?<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="key"></TMPL_IF>">
+    <span class="glyphicon glyphicon-info-sign"></span>&nbsp;
     <lang en="Reset my password" fr="R&eacute;initialiser mon mot de passe"/>
   </a>
   </TMPL_IF>
 
+  <TMPL_IF NAME="DISPLAY_REGISTER">
+  <a class="btn btn-warning" href="<TMPL_VAR NAME="REGISTER_URL"><TMPL_IF NAME="key">?<TMPL_VAR NAME="CHOICE_PARAM">=<TMPL_VAR NAME="key"></TMPL_IF>">
+    <span class="glyphicon glyphicon-plus-sign"></span>&nbsp;
+    <lang en="Create an account" fr="Cr&eacute;er un compte"/>
+  </a>
+  </TMPL_IF>
+</div>
+
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm
index 4b2c1a37a..04cb0c332 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm
@@ -202,7 +202,9 @@ sub display {
             CHECK_LOGINS          => $self->{portalCheckLogins},
             ASK_LOGINS            => $self->{checkLogins},
             DISPLAY_RESETPASSWORD => $self->{portalDisplayResetPassword},
+            DISPLAY_REGISTER      => $self->{portalDisplayRegister},
             MAIL_URL              => $self->{mailUrl},
+            REGISTER_URL          => $self->{registerUrl},
             HIDDEN_INPUTS         => $self->buildHiddenForm(),
             LOGIN_INFO            => $self->loginInfo(),
         );