diff --git a/app/__init__.py b/app/__init__.py
index d4601a2dd640a5c994b9a218780bda7cef126427..3dc5f8e3057b317ec2c7851e812367792b57e4f8 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -51,13 +51,13 @@ def create_app(config_name):
         session['return_url'] = request.args.get('redir', vars.default_referrer)
 
         if (not any(item in session['user'].get('eppa') for item in valid_eppa)):
-            return render_template('errors/shibboleth.html')
+            return render_template('account/unauthorized.html')
 
         if rc_util.check_state(session['user'].get('username')) == "blocked":
-            return render_template('errors/blocked.html')
+            return render_template('account/blocked.html')
 
         elif rc_util.check_state(session['user'].get('username')) == "certification":
-              return render_template('errors/certify.html', room_id=session['uid'],
+              return render_template('account/certify.html', room_id=session['uid'],
                                username=session['user'].get('username'),
                                fullname=session['user'].get('fullname'), email=session['user'].get('email'),
                                referrer=session['return_url'], cancel_url=vars.default_referrer,