diff --git a/kukv1.py b/kukv1.py
index c0b4fe9..d56d725 100644
--- a/kukv1.py
+++ b/kukv1.py
@@ -95,7 +95,6 @@ def addme():
 		return render_template('appresponse.html', message='Only one meal per person!')
 
 @app.route('/')
-@login_required
 def index():
 	return render_template('meal_list.html', leaderboard=getLeaderboard(), meals=getUpcomingMeals())
 
@@ -114,7 +113,7 @@ def login():
         	u = User.get(username)
         	u.user_id = result[0]['id']
 	        login_user(u)
-	        return redirect(request.args.get("next"))
+	        return redirect(request.args.get('next') or url_for('index'))
         return abort(401)
     else:
         return Response('''
diff --git a/templates/meal_list.html b/templates/meal_list.html
index 4a4db4f..97d4500 100644
--- a/templates/meal_list.html
+++ b/templates/meal_list.html
@@ -46,10 +46,16 @@
 			{% endfor%}
 		</div>
 		<div class="user-card">
+			{% if current_user.is_authenticated %}
 			<img src="{{url_for('static', filename=current_user.name + '.png')}}">
+			{% endif %}
 			<div class="user-info">
+				{% if current_user.is_authenticated %}
 				<span>{{current_user.name}}</span>
 				<div class="rect-button" onclick="location.href='/logout';" style="background-color: #EE7500;">LOGOUT</div>
+				{% else %}
+				<div class="rect-button" onclick="location.href='/login';" style="background-color: #EE7500;">LOGIN</div>
+				{% endif %}
 			</div>
 		</div>
 	</div>