diff --git a/app/__init__.py b/app/__init__.py
index 871f0809b6a9b2c7333ccfff0d60772d8947b5de..809b858a19723a662a7e112b650410572a2ec81b 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -48,17 +48,17 @@ 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('account/unauthorized.html', unauthorized_message=messages.unauthorized_message)
+            return render_template('account/unauthorized.html', unauthorized_msg=messages.unauthorized_message)
 
         if rc_util.check_state(session['user'].get('username')) == "blocked":
-            return render_template('account/blocked.html', unauthorized_message=messages.unauthorized_message)
+            return render_template('account/blocked.html', unauthorized_msg=messages.unauthorized_message)
 
         elif rc_util.check_state(session['user'].get('username')) == "certification":
               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,
-                               cancel_msg=messages.cancel_message, certification_message=messages.certification_message)
+                               cancel_msg=messages.cancel_message, certification_msg=messages.certification_message)
         else:
             return render_template('auth/SignUp.html', room_id=session['uid'],
                                username=session['user'].get('username'),
diff --git a/app/templates/account/blocked.html b/app/templates/account/blocked.html
index b7b729f9dce1357d7c699240f61eed9ac5cd4251..f716dfd7ce621c1525a170b08205785afdd10bf4 100644
--- a/app/templates/account/blocked.html
+++ b/app/templates/account/blocked.html
@@ -53,7 +53,7 @@
   <div class="col-md-10 col-sm-10 my-col">
     <div id="form-wrapper">
     <h2> Account blocked </h2>
-    <p style="font-size:110%;"> {{ unauthorized_message |safe }}</p>
+    <p style="font-size:110%;"> {{ unauthorized_msg |safe }}</p>
     </div>
   </div>
 </div>  
diff --git a/app/templates/account/certify.html b/app/templates/account/certify.html
index 1ed9819cceb2b039185ea755465cea5f743b0a6d..acce5bfcb90a9e43812958fd71c40dab567f38fe 100644
--- a/app/templates/account/certify.html
+++ b/app/templates/account/certify.html
@@ -80,7 +80,7 @@
   <div class="col-md-10 col-sm-10 my-col">
     <div id="form-wrapper">
     <h2> Annual Recertification Form </h2>
-    <p style="font-size:110%;"> {{ certification_message |safe }}</p>
+    <p style="font-size:110%;"> {{ certification_msg |safe }}</p>
       <div id="user-input">    
         <form id="signup" data-toggle="validator" role="form" action="." method="post" onsubmit="">
           <div class="col-md-7 col-sm-7 my-col">
diff --git a/app/templates/account/unauthorized.html b/app/templates/account/unauthorized.html
index ba826f890f731338fffb4095aa3da7e46e7da74c..339a4200bddebf23ec9e4427278304a583e09b9c 100644
--- a/app/templates/account/unauthorized.html
+++ b/app/templates/account/unauthorized.html
@@ -53,7 +53,7 @@
   <div class="col-md-10 col-sm-10 my-col">
     <div id="form-wrapper">
     <h2> Account Authorization  error </h2>
-    <p style="font-size:110%;"> {{ unauthorized_message |safe }}</p>
+    <p style="font-size:110%;"> {{ unauthorized_msg |safe }}</p>
     </div>
   </div>
 </div>