diff --git a/dspace-jspui/src/main/webapp/components/login-form.jsp b/dspace-jspui/src/main/webapp/components/login-form.jsp
index 5891508db9..ac5338ca2f 100644
--- a/dspace-jspui/src/main/webapp/components/login-form.jsp
+++ b/dspace-jspui/src/main/webapp/components/login-form.jsp
@@ -14,16 +14,20 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"
     prefix="fmt" %>
 	<div class="panel-body">
-     <form name="loginform" class="form" id="loginform" method="post" action="<%= request.getContextPath() %>/password-login">  
+     <form name="loginform" class="form-horizontal" id="loginform" method="post" action="<%= request.getContextPath() %>/password-login">  
       <p><strong><a href="<%= request.getContextPath() %>/register"><fmt:message key="jsp.components.login-form.newuser"/></a></strong></p>
 	  <p><fmt:message key="jsp.components.login-form.enter"/></p>
-		<div class="row">
-            <label class="col-md-2" for="tlogin_email"><fmt:message key="jsp.components.login-form.email"/></label>
-            <input class="col-md-3" type="text" name="login_email" id="tlogin_email" tabindex="1" />
+		<div class="form-group">
+            <label class="col-md-2 control-label" for="tlogin_email"><fmt:message key="jsp.components.login-form.email"/></label>
+            <div class="col-md-6">
+            	<input class="form-control" type="text" name="login_email" id="tlogin_email" tabindex="1" />
+            </div>
         </div>
-        <div class="row">
-            <label class="col-md-2" for="tlogin_password"><fmt:message key="jsp.components.login-form.password"/></label>
-            <input class="col-md-3" type="password" name="login_password" id="tlogin_password" tabindex="2" />
+        <div class="form-group">
+            <label class="col-md-2 control-label" for="tlogin_password"><fmt:message key="jsp.components.login-form.password"/></label>
+            <div class="col-md-6">
+            	<input class="form-control" type="password" name="login_password" id="tlogin_password" tabindex="2" />
+            </div>
         </div>
         <div class="row">
         <div class="col-md-6">
diff --git a/dspace-jspui/src/main/webapp/login/incorrect.jsp b/dspace-jspui/src/main/webapp/login/incorrect.jsp
index 135064d12d..cd6386e7eb 100644
--- a/dspace-jspui/src/main/webapp/login/incorrect.jsp
+++ b/dspace-jspui/src/main/webapp/login/incorrect.jsp
@@ -22,26 +22,28 @@
 <%@ page import="javax.servlet.jsp.jstl.fmt.LocaleSupport" %>
 
 
-<dspace:layout navbar="off"
+<dspace:layout style="submission" navbar="default"
                locbar="nolink"
                titlekey="jsp.login.incorrect.title">
 
-    <table border="0" width="90%">
-       <tr>
-            <td align="left">
+
                 <%-- <h1>Log In to DSpace</h1> --%>
-                <h1><fmt:message key="jsp.login.incorrect.heading"/></h1>
-            </td>
-            <td align="right" class="standard">
+                <h1><fmt:message key="jsp.login.incorrect.heading"/>
                 <dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#login\"%>"><fmt:message key="jsp.help"/></dspace:popup>
-            </td>
-        </tr>
-    </table>
+                </h1>
+
+                
+
 
     <%-- <p align="center"><strong>The e-mail address and password you supplied were not valid.  Please try again, or have you <a href="<%= request.getContextPath() %>/forgot">forgotten your password</a>?</strong></p> --%>
-    <p align="center"><strong><fmt:message key="jsp.login.incorrect.text">
+    <p class="alert alert-warning"><strong><fmt:message key="jsp.login.incorrect.text">
         <fmt:param><%= request.getContextPath() %>/forgot</fmt:param>
     </fmt:message></strong></p>
 
+	<div class="panel panel-primary">
+        <div class="panel-heading"><fmt:message key="jsp.login.password.heading"/>
+        <span class="pull-right"><dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.index\") + \"#login\"%>"><fmt:message key="jsp.help"/></dspace:popup></span>
+        </div>
     <dspace:include page="/components/login-form.jsp" />
+    </div>
 </dspace:layout>
diff --git a/dspace-jspui/src/main/webapp/register/forgot-password.jsp b/dspace-jspui/src/main/webapp/register/forgot-password.jsp
index 03c2aa96e0..8067a6014a 100644
--- a/dspace-jspui/src/main/webapp/register/forgot-password.jsp
+++ b/dspace-jspui/src/main/webapp/register/forgot-password.jsp
@@ -41,39 +41,31 @@
 %>
     <%-- <p><strong>The e-mail address you entered was not recognized.  Please
     try again.</strong></p> --%>
-	<p><strong><fmt:message key="jsp.register.forgot-password.info1"/></strong></p>
+	<p class="alert alert-warning"><fmt:message key="jsp.register.forgot-password.info1"/></p>
 <%
     }
 %>
     <%-- <p>Please enter your e-mail
     address in the box below and click "I Forgot My Password".  You'll be sent
     an e-mail which will allow you to set a new password.</p> --%>
-	<p><fmt:message key="jsp.register.forgot-password.info2"/></p>
+	<p class="alert alert-info"><fmt:message key="jsp.register.forgot-password.info2"/></p>
     
-    <form action="<%= request.getContextPath() %>/forgot" method="post">
+    <form class="form-horizontal" action="<%= request.getContextPath() %>/forgot" method="post">
         <input type="hidden" name="step" value="<%= RegisterServlet.ENTER_EMAIL_PAGE %>"/>
 
-        <center>
-            <table class="miscTable">
-                <tr>
-                    <td class="oddRowEvenCol">
-                        <table border="0" cellpadding="5">
-                            <tr>
-                                <%-- <td class="standard"><strong>E-mail Address:</strong></td> --%>
-								<td class="standard"><strong><label for="temail"><fmt:message key="jsp.register.forgot-password.email.field"/></strong></label></td>
-                                <td class="standard"><input type="text" name="email" id="temail" /></td>
-                            </tr>
-                            <tr>
-                                <td align="center" colspan="2">
-                                    <%-- <input type="submit" name="submit" value="I Forgot My Password"> --%>
-									<input type="submit" name="submit" value="<fmt:message key="jsp.register.forgot-password.forgot.button"/>" />
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
-        </center>
+                   	<%-- <td class="standard"><strong>E-mail Address:</strong></td> --%>
+					<div class="form-group">
+            			<label class="col-md-2 control-label" for="temail"><fmt:message key="jsp.register.forgot-password.email.field"/></label>
+            			<div class="col-md-6">
+            				<input class="form-control" type="text" name="email" id="temail" />
+            			</div>
+            		</div>                    
+					<div class="row">
+        				<div class="col-md-6">
+							<%-- <input type="submit" name="submit" value="I Forgot My Password"> --%>
+							<input class="btn btn-success pull-right" type="submit" name="submit" value="<fmt:message key="jsp.register.forgot-password.forgot.button"/>" />
+						</div>
+					</div>
     </form>
     
 </dspace:layout>