diff --git a/src/main/resources/fess.xml b/src/main/resources/fess.xml
index fdbe27491..b9be2e70d 100644
--- a/src/main/resources/fess.xml
+++ b/src/main/resources/fess.xml
@@ -108,6 +108,10 @@
 			<arg>"login"</arg>
 			<arg>"login/index.jsp"</arg>
 		</postConstruct>
+		<postConstruct name="addDesignJspFileName">
+			<arg>"newpassword"</arg>
+			<arg>"login/newpassword.jsp"</arg>
+		</postConstruct>
 		<postConstruct name="addDesignJspFileName">
 			<arg>"profile"</arg>
 			<arg>"profile/index.jsp"</arg>
diff --git a/src/main/webapp/WEB-INF/orig/view/login/index.jsp b/src/main/webapp/WEB-INF/orig/view/login/index.jsp
index 93061137c..f99878d1e 100644
--- a/src/main/webapp/WEB-INF/orig/view/login/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/login/index.jsp
@@ -35,7 +35,7 @@
 					</la:info>
 					<la:errors />
 				</div>
-				<la:form styleId="/login" method="post">
+				<la:form styleId="login" method="post">
 					<div class="input-group mb-3">
 						<c:set var="ph_username">
 							<la:message key="labels.login.placeholder_username" />
diff --git a/src/main/webapp/WEB-INF/orig/view/login/newpassword.jsp b/src/main/webapp/WEB-INF/orig/view/login/newpassword.jsp
new file mode 100644
index 000000000..701d0f285
--- /dev/null
+++ b/src/main/webapp/WEB-INF/orig/view/login/newpassword.jsp
@@ -0,0 +1,81 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head profile="http://a9.com/-/spec/opensearch/1.1/">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<title><la:message key="labels.login.title" /></title>
+<link href="${fe:url('/css/admin/bootstrap.min.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/font-awesome.min.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/adminlte.min.css')}" rel="stylesheet" type="text/css" />
+<link href="${fe:url('/css/admin/style.css')}" rel="stylesheet" type="text/css" />
+<!--[if lt IE 9]>
+<script src="${fe:url('/css/admin/html5shiv.min.js')}"></script>
+<script src="${fe:url('/css/admin/respond.min.js')}"></script>
+<![endif]-->
+</head>
+<body class="hold-transition login-page">
+	<div class="login-box">
+		<div class="login-logo">
+			<la:link href="/">
+				<img src="${fe:url('/images/logo-top.png')}"
+					alt="<la:message key="labels.header_brand_name" />" />
+			</la:link>
+		</div>
+		<div class="card">
+			<div class="card-body login-card-body">
+				<p class="login-box-msg">
+					<la:message key="labels.login.newpassword" />
+				</p>
+				<%-- Message --%>
+				<div>
+					<la:info id="msg" message="false">
+						<div class="alert alert-info">${msg}</div>
+					</la:info>
+					<la:errors />
+				</div>
+				<la:form styleId="newPassword" method="post">
+					<div class="input-group mb-3">
+						<c:set var="ph_new_password">
+							<la:message key="labels.login.placeholder_new_password" />
+						</c:set>
+						<la:password property="password" class="form-control"
+							placeholder="${ph_new_password}" />
+						<div class="input-group-append">
+							<span class="input-group-text">
+								<em class="fa fa-lock fa-fw"></em>
+							</span>
+						</div>
+					</div>
+					<div class="input-group mb-3">
+						<c:set var="ph_confirm_password">
+							<la:message key="labels.login.placeholder_confirm_new_password" />
+						</c:set>
+						<la:password property="confirmPassword" class="form-control"
+							placeholder="${ph_confirm_password}" />
+						<div class="input-group-append">
+							<span class="input-group-text">
+								<em class="fa fa-lock fa-fw"></em>
+							</span>
+						</div>
+					</div>
+					<div class="text-center">
+						<button type="submit" name="changePassword"
+							class="btn btn-primary btn-block"
+							value="<la:message key="labels.login.update"/>">
+							<em class="fa fa-pencil-alt"></em>
+							<la:message key="labels.login.update" />
+						</button>
+					</div>
+				</la:form>
+			</div>
+		</div>
+	</div>
+	<input type="hidden" id="contextPath" value="${contextPath}" />
+	<script type="text/javascript" src="${fe:url('/js/admin/popper.min.js')}"></script>
+	<script type="text/javascript"
+		src="${fe:url('/js/admin/jquery-3.4.1.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/admin/bootstrap.min.js')}"></script>
+	<script type="text/javascript" src="${fe:url('/js/login.js')}"></script>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/orig/view/profile/index.jsp b/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
index d41e0e9e4..ddabe6b01 100644
--- a/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
@@ -34,7 +34,7 @@
 					</la:info>
 					<la:errors />
 				</div>
-				<la:form styleId="/login" method="post">
+				<la:form styleId="updatePassword" method="post">
 					<div class="input-group mb-3">
 						<c:set var="ph_old_password">
 							<la:message key="labels.profile.placeholder_old_password" />
diff --git a/src/main/webapp/WEB-INF/view/profile/index.jsp b/src/main/webapp/WEB-INF/view/profile/index.jsp
index 21dcd9aae..ddabe6b01 100644
--- a/src/main/webapp/WEB-INF/view/profile/index.jsp
+++ b/src/main/webapp/WEB-INF/view/profile/index.jsp
@@ -49,7 +49,7 @@
 						<c:set var="ph_new_password">
 							<la:message key="labels.profile.placeholder_new_password" />
 						</c:set>
-						<la:password property="oldPassword" class="form-control"
+						<la:password property="newPassword" class="form-control"
 									 placeholder="${ph_new_password}" />
 						<div class="input-group-append">
 							<span class="input-group-text"><em class="fa fa-lock fa-fw"></em></span>
