diff --git a/templates/base.html b/templates/base.html
index 00ed279d2af313aede39b02aaf9514a0db3707c4..2c1cfb91e112c3a693a6a9b9e376476d81f0ec21 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -55,18 +55,25 @@
 										 <a href="{{ href|e }}">{% if gly != '' %}<span class="glyphicon glyphicon-{{ gly }}"></span> {% endif %}{{ caption }}</a>
 									</li>
 									{% endfor %}
-									<li class="navbar-right" >
+									<li class="navbar-right">
+										{% if not session.userid is defined %}
 										<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>
+											<span class="glyphicon glyphicon-log-in"></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>'
+														title:'Login für Moderatoren',
+														content:'<form method="post" action="login"><input placeholder="User" name="user" type="text"><br><input placeholder="Password" name="password" type="password"><br><input type="hidden" name="ref" value="{{ request.url|e }}"><input type="submit" value="Login"></form>'
 													}
 											)
 										</script>
+										{% else %}
+										<a herf="/logout">
+											<span class="glyphicon glyphicon-log-out"></span>
+										</a>
+										{% endif %}
 									</li>
 								</ul>
 							</div>