diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl
index def4a55ffe..163d783ec0 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-passwd.tmpl
@@ -1,33 +1,47 @@
-<!-- TMPL_INCLUDE name="opac-top.inc" -->
-<div id="mainbloc">
-<h1>Cambio de clave de usuarios</h1>
-
-<!-- TMPL_IF NAME= "Error_messages" -->
-	<p>Error</p>
-	<!-- TMPL_IF NAME= "PassMismatch" -->
-	<p>No coinciden las claves</p>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME= "ShortPass" -->
-	<p>La clave debe tener mas de 5 caracteres</p>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME= "WrongPass" -->
-	<p> Ingrese correctamente su clave de usuario</p>
-	<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME= "Ask_data" -->
-<form action="/cgi-bin/koha/opac-passwd.pl" method="get">
-	<p><label>Clave Vieja</label><input type="password"  size="25"  name="Oldkey" /></p>
-	<p><label>Clave Nueva</label><input type="password"  size="25"  name="Newkey" /></p>
-	<p><label>Repita la Clave</label><input type="password"  size="25" name="Confirm" /></p>
-	<p><input type="image" src="/opac-tmpl/css/es/images/boton_enviar.gif" width="70" height="30" value="submit"  align="bottom"/></p>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME= "Cambio_clave" -->
-	<p>Ha cambiado la clave con exito</p>
-<!-- /TMPL_IF -->
-</form>
-</div>
-</div>
-</body>
-</html>
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Change Your Password
+<!-- TMPL_INCLUDE name="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="navigation.inc" -->
+
+<!-- CONTENT -->
+<div id="main">
+
+
+
+<!-- TMPL_IF NAME= "Error_messages" -->
+<h3>There was a problem with your submission</h3>
+<p class="error">
+	<!-- TMPL_IF NAME= "PassMismatch" -->
+	Passwords do not match.  Please re-type your new password.
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME= "ShortPass" -->
+	Your new password must be at least 6 characters long
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME= "WrongPass" -->
+	Your current password was entered incorrectly.  If this problem persists, please ask a librarian to re-set your password for you.	
+	<!-- /TMPL_IF --></p>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME= "Ask_data" -->
+<h1>Change your Password</h1>
+<form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="get">
+<div class="form">
+<table><tr><th><label for="password">Current Password:</label></th><td><input type="password" id="Oldkey" size="25"  name="Oldkey" /></td></tr>
+<tr><th><label for="Newkey">New Password:</label></th><td><input type="password" id="Newkey"  size="25"  name="Newkey" /></td></tr>
+<tr>	<th><label for="Confirm">Re-Type New Password:</label></th><td><input type="password"  id="Confirm" size="25" name="Confirm" /></td></tr></table>
+	<p><input type="submit" value="Submit Changes" class="submit" /></p>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME= "password_updated" -->
+<h1>Password Updated</h1>
+	Your password has been changed
+	<form action="/cgi-bin/koha/opac-user.pl" method="post">
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+		<p><input type="submit" class="icon back" value="Return to Your Record" /></p>
+	</form>
+<!-- /TMPL_IF -->
+</form>
+
+</div>
+</body>
+</html>