diff --git a/lemonldap-ng-portal/site/templates/bootstrap/header.tpl b/lemonldap-ng-portal/site/templates/bootstrap/header.tpl
index 787166f8f..f81cc00b6 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/header.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/header.tpl
@@ -2,15 +2,27 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title trspan="authenticationPortal">Authentication portal</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link rel="shortcut icon" type="image/vnd.microsoft.icon" sizes="16x16 32x32 48x48 64x64 128x128" href="<TMPL_VAR NAME="STATIC_PREFIX">logos/favicon.ico" />
-  <link rel="icon" type="image/vnd.microsoft.icon" sizes="16x16 32x32 48x48 64x64 128x128" href="<TMPL_VAR NAME="STATIC_PREFIX">logos/favicon.ico" />
+  <meta http-equiv="Content-Script-Type" content="text/javascript" />
+  <meta http-equiv="cache-control" content="no-cache" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <!-- //if:usedebianlibs
+  <link rel="stylesheet" type="text/css" href="/javascript/bootstrap/css/bootstrap.min.css" />
+  <link rel="stylesheet" type="text/css" href="/javascript/bootstrap/css/bootstrap-theme.min.css" />
   <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/portal.min.css" />
 //elsif:useexternallibs
+  <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
+  <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" />
   <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/portal.min.css" />
 //elsif:cssminified
+  <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/bootstrap.min.css" />
+  <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/bootstrap-theme.min.css" />
   <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/portal.min.css" />
 //else -->
+  <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/bootstrap.css" />
+  <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/bootstrap-theme.css" />
   <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX">css/portal.css" />
+<!-- //endif -->
+  <link rel="shortcut icon" type="image/vnd.microsoft.icon" sizes="16x16 32x32 48x48 64x64 128x128" href="<TMPL_VAR NAME="STATIC_PREFIX">logos/favicon.ico" />
+  <link rel="icon" type="image/vnd.microsoft.icon" sizes="16x16 32x32 48x48 64x64 128x128" href="<TMPL_VAR NAME="STATIC_PREFIX">logos/favicon.ico" />
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
index bd79ffac5..74c977d16 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
@@ -1,11 +1,24 @@
 <TMPL_INCLUDE NAME="header.tpl">
-
 </head>
-
 <body>
+  <div id="logincontent" class="container">
 
-  <TMPL_INCLUDE NAME="scripts.tpl">
 
-</body>
+    <TMPL_IF NAME="AUTH_ERROR">
+    <div class="message message-<TMPL_VAR NAME="AUTH_ERROR_TYPE"> alert"><TMPL_VAR NAME="AUTH_ERROR"></div>
+    </TMPL_IF>
 
+    <div class="panel panel-default">
+      <form action="#" method="post" class="login" role="form">
+        <!-- Hidden fields -->
+        <TMPL_VAR NAME="HIDDEN_INPUTS">
+        <input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
+        <input type="hidden" name="timezone" />
+        <TMPL_INCLUDE NAME="standardform.tpl">
+      </form>
+
+    </div>
+  </div>
+
+<TMPL_INCLUDE NAME="scripts.tpl">
 <TMPL_INCLUDE NAME="footer.tpl">
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/scripts.tpl b/lemonldap-ng-portal/site/templates/bootstrap/scripts.tpl
index 5626b81dc..74224690e 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/scripts.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/scripts.tpl
@@ -12,14 +12,25 @@
 
 <!-- //if:usedebianlibs
 <script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="/javascript/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">js/portal.min.js"></script>
 //elsif:useexternallibs
 <script type="text/javascript" src="http://code.jquery.com/jquery-2.2.0.min.js"></script>
+<script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">js/portal.min.js"></script>
 //elsif:jsminified
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/jquery/dist/jquery.min.js"></script>
+<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/bootstrap/dist/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">js/portal.min.js"></script>
 //else -->
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/jquery/dist/jquery.js"></script>
+<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">bwr/bootstrap/dist/js/bootstrap.js"></script>
 <script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">js/portal.js"></script>
 <!-- //endif -->
+
+<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+<!--[if lt IE 9]>
+  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+<![endif]-->
