diff --git a/flask_security/templates/security/logins/new.html b/flask_security/templates/security/logins/new.html
index b3871f7..f5d9998 100644
--- a/flask_security/templates/security/logins/new.html
+++ b/flask_security/templates/security/logins/new.html
@@ -1,10 +1,10 @@
-{% include "../messages.html" %}
+{% include "security/messages.html" %}
 <h1>Login</h1>
 <form action="{{ url_for('flask_security.authenticate') }}" method="POST" name="login_form">
-  {{ form.hidden_tag() }}
-  {{ form.email.label }} {{ form.email }}<br/>
-  {{ form.password.label }} {{ form.password }}<br/>
-  {{ form.remember.label }} {{ form.remember }}<br/>
-  {{ form.next }}
-  {{ form.submit }}
+  {{ login_form.hidden_tag() }}
+  {{ login_form.email.label }} {{ login_form.email }}<br/>
+  {{ login_form.password.label }} {{ login_form.password }}<br/>
+  {{ login_form.remember.label }} {{ login_form.remember }}<br/>
+  {{ login_form.next }}
+  {{ login_form.submit }}
 </form>
\ No newline at end of file
diff --git a/flask_security/templates/security/registrations/edit.html b/flask_security/templates/security/registrations/edit.html
index 5c2f24b..de100f7 100644
--- a/flask_security/templates/security/registrations/edit.html
+++ b/flask_security/templates/security/registrations/edit.html
@@ -1,4 +1,4 @@
-{% include "../messages.html" %}
+{% include "security/messages.html" %}
 <h1>Edit account</h1>
 <form action="{{ url_for('flask_security.update_user') }}" method="POST" name="edit_user_form">
   {{ edit_user_form.hidden_tag() }}
diff --git a/flask_security/templates/security/registrations/new.html b/flask_security/templates/security/registrations/new.html
index dc0fdd8..133f5d8 100644
--- a/flask_security/templates/security/registrations/new.html
+++ b/flask_security/templates/security/registrations/new.html
@@ -1,4 +1,4 @@
-{% include "../messages.html" %}
+{% include "security/messages.html" %}
 <h1>Register</h1>
 <form action="{{ url_for('flask_security.register') }}" method="POST" name="register_user_form">
   {{ register_user_form.hidden_tag() }}