diff --git a/templates/base.html b/templates/base.html
index f435640b0e173f0951a3b0eb85a5a8df06d444bd..00ed279d2af313aede39b02aaf9514a0db3707c4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -54,7 +54,20 @@
 									 <li{% if id == active_page %} class="active"{% endif %}>
 										 <a href="{{ href|e }}">{% if gly != '' %}<span class="glyphicon glyphicon-{{ gly }}"></span> {% endif %}{{ caption }}</a>
 									</li>
-									 {% endfor %}
+									{% endfor %}
+									<li class="navbar-right" >
+										<a id="loginpopover" data-container="body" data-toggle="popover" data-placement="bottom"> 
+											<span class="glyphicon glyphicon-user"></span> <span class="glyphicon glyphicon-menu-down"></span>
+										</a>
+										<script>
+											$('#loginpopover').popover(
+													{
+														html:true,
+														content:'<form method="post" action="login"><span>User: <input name="user" type="text"></span><br><span>Password: <input name="password" type="password"></span><input type="hidden" name="ref" value="{{ request.url|e }}"><input type="submit"></form>'
+													}
+											)
+										</script>
+									</li>
 								</ul>
 							</div>
 							<div class="col-xs-12 col-sm-4">
@@ -66,6 +79,8 @@
 								</form>
 							</div>
 						</div>
+						<div class="row">
+						</div>
 					</div>
 				</div>
 			</div>