Index: core/install/english.lang
===================================================================
--- core/install/english.lang
+++ core/install/english.lang
@@ -1872,7 +1872,7 @@
 			</EVENT>
 			<EVENT Event="USER.PSWDC" Type="0">
 				<SUBJECT>UmVzZXQgUGFzc3dvcmQgQ29uZmlybWF0aW9u</SUBJECT>
-				<HTMLBODY>SGVsbG8sPGJyLz48YnIvPg0KDQpJdCBzZWVtcyB0aGF0IHlvdSBoYXZlIHJlcXVlc3RlZCBhIHBhc3N3b3JkIHJlc2V0IGZvciB5b3VyIEluLXBvcnRhbCBhY2NvdW50LiBJZiB5b3Ugd291bGQgbGlrZSB0byBwcm9jZWVkIGFuZCBjaGFuZ2UgdGhlIHBhc3N3b3JkLCBwbGVhc2UgY2xpY2sgb24gdGhlIGxpbmsgYmVsb3c6PGJyLz48YnIvPg0KDQo8YSBocmVmPSI8aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+Ij48aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+PC9hPjxici8+PGJyLz4NCg0KWW91IHdpbGwgcmVjZWl2ZSBhIHNlY29uZCBlbWFpbCB3aXRoIHlvdXIgbmV3IHBhc3N3b3JkIHNob3J0bHkuPGJyLz48YnIvPg0KDQpJZiB5b3UgYmVsaWV2ZSB5b3UgaGF2ZSByZWNlaXZlZCB0aGlzIGVtYWlsIGluIGVycm9yLCBwbGVhc2UgaWdub3JlIHRoaXMgZW1haWwuIFlvdXIgcGFzc3dvcmQgd2lsbCBub3QgYmUgY2hhbmdlZCB1bmxlc3MgeW91IGhhdmUgY2xpY2tlZCBvbiB0aGUgYWJvdmUgbGluay4NCg==</HTMLBODY>
+				<HTMLBODY>SGVsbG8sPGJyLz48YnIvPg0KDQpJdCBzZWVtcyB0aGF0IHlvdSBoYXZlIHJlcXVlc3RlZCBhIHBhc3N3b3JkIHJlc2V0IGZvciB5b3VyIGFjY291bnQuIElmIHlvdSB3b3VsZCBsaWtlIHRvIHByb2NlZWQgd2l0aCB0aGUgY2hhbmdlIG9mIHlvdXIgb2xkIHBhc3N3b3JkLCBwbGVhc2UgY2xpY2sgb24gdGhlIGxpbmsgYmVsb3c6PGJyLz48YnIvPg0KDQo8YSBocmVmPSI8aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+Ij48aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+PC9hPjxici8+PGJyLz4NCg0KT25jZSBjbGlja2VkLCB5b3UnbGwgYmUgdGFrZW4gdG8gdGFrZW4gdG8gdGhlIHBhZ2Ugd2hlcmUgeW91IGNhbiBzZXQgeW91ciBuZXcgcGFzc3dvcmQuPGJyLz48YnIvPg0KDQpJZiB5b3UgYmVsaWV2ZSB5b3UgaGF2ZSByZWNlaXZlZCB0aGlzIGVtYWlsIGluIGVycm9yLCBwbGVhc2UgaWdub3JlIHRoaXMgZW1haWwuIFlvdXIgcGFzc3dvcmQgd2lsbCBub3QgYmUgY2hhbmdlZCB1bmxlc3MgeW91IHN1Y2Nlc3NmdWxseSBjaGFuZ2UgaXQgYnkgZm9sbG93aW5nIHRoZSBhYm92ZSBsaW5rLg0K</HTMLBODY>
 			</EVENT>
 			<EVENT Event="USER.SUBSCRIBE" Type="0">
 				<SUBJECT>U3Vic2NyaWJlZCB0byBhIE1haWxpbmcgTGlzdCBvbiA8aW5wMjptX0xpbmsgdGVtcGxhdGU9ImluZGV4Ii8+</SUBJECT>
Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql
+++ core/install/upgrades.sql
@@ -2935,3 +2935,31 @@
 
 UPDATE SystemSettings SET VariableValue = 1 WHERE VariableName = 'CSVExportEncoding';
 ALTER TABLE Semaphores ADD MainIDs INT NULL DEFAULT NULL AFTER MainPrefix;
+
+UPDATE EmailTemplates
+SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'your In-portal account', 'your account')
+WHERE TemplateName = 'USER.PSWDC';
+
+UPDATE EmailTemplates
+SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'If you would like to proceed and change the password', 'If you would like to proceed with the change of your old password')
+WHERE TemplateName = 'USER.PSWDC';
+
+UPDATE EmailTemplates
+SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'You will receive a second email with your new password shortly.', 'Once clicked, you''ll be taken to taken to the page where you can set your new password.')
+WHERE TemplateName = 'USER.PSWDC';
+
+UPDATE EmailTemplates
+SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'Your password will not be changed unless you have clicked on the above link.', 'Your password will not be changed unless you successfully change it by following the above link.')
+WHERE TemplateName = 'USER.PSWDC';
+
+UPDATE LanguageLabels
+SET l1_Translation = 'Enter your Username or Email below to continue with resetting your password.'
+WHERE PhraseKey = 'LU_ENTERFORGOTUSEREMAIL';
+
+UPDATE LanguageLabels
+SET l1_Translation = REPLACE(l1_Translation, 'Please follow the link in the email in order to receive a new password.', 'Please follow the link in that email to set your new password.')
+WHERE PhraseKey = 'LU_TEXT_FORGOTPASSRESETEMAILSENT';
+
+UPDATE LanguageLabels
+SET l1_Translation = 'Your password has been successfully changed.'
+WHERE PhraseKey = 'LU_TEXT_FORGOTPASSHASBEENRESET';
Index: themes/advanced/_install/english.lang
===================================================================
--- themes/advanced/_install/english.lang
+++ themes/advanced/_install/english.lang
@@ -22,6 +22,7 @@
 			<PHRASE Label="lu_btn_Clear" Module="Core" Type="0">Q2xlYXI=</PHRASE>
 			<PHRASE Label="lu_btn_CloseWindow" Module="Core" Type="0">Q2xvc2UgV2luZG93</PHRASE>
 			<PHRASE Label="lu_btn_Contact" Module="Core" Type="0">Q29udGFjdA==</PHRASE>
+			<PHRASE Label="lu_btn_Continue" Module="Core" Type="0">Q29udGludWU=</PHRASE>
 			<PHRASE Label="lu_btn_Create" Module="Core" Type="0">Q3JlYXRl</PHRASE>
 			<PHRASE Label="lu_btn_Delete" Module="Core" Type="0">RGVsZXRl</PHRASE>
 			<PHRASE Label="lu_btn_DeleteFile" Module="Core" Type="0">RGVsZXRlIEZpbGU=</PHRASE>
@@ -41,6 +42,7 @@
 			<PHRASE Label="lu_btn_Select" Module="Core" Type="0">U2VsZWN0</PHRASE>
 			<PHRASE Label="lu_btn_SendPassword" Module="Core" Type="0">UmVjb3ZlciBQYXNzd29yZA==</PHRASE>
 			<PHRASE Label="lu_btn_Set" Module="Core" Type="0">U2V0</PHRASE>
+			<PHRASE Label="lu_btn_SetNewPassword" Module="Core" Type="0">U2V0IE5ldyBQYXNzd29yZA==</PHRASE>
 			<PHRASE Label="lu_btn_Sort" Module="Core" Type="0">U29ydA==</PHRASE>
 			<PHRASE Label="lu_btn_Subscribe" Module="Core" Type="0">U3Vic2NyaWJl</PHRASE>
 			<PHRASE Label="lu_btn_Unsubscribe" Module="Core" Type="0">VW5zdWJzY3JpYmU=</PHRASE>
@@ -172,6 +174,7 @@
 			<PHRASE Label="lu_fld_module" Module="Core" Type="0">TW9kdWxl</PHRASE>
 			<PHRASE Label="lu_fld_MoreCategories" Module="Core" Type="0">QWRkaXRpb25hbCBDYXRlZ29yaWVz</PHRASE>
 			<PHRASE Label="lu_fld_Name" Module="Core" Type="0">TmFtZQ==</PHRASE>
+			<PHRASE Label="lu_fld_NewPassword" Module="Core" Type="0">TmV3IFBhc3N3b3Jk</PHRASE>
 			<PHRASE Label="lu_fld_Password" Module="Core" Type="0">UGFzc3dvcmQ=</PHRASE>
 			<PHRASE Label="lu_fld_Phone" Module="Core" Type="0">UGhvbmU=</PHRASE>
 			<PHRASE Label="lu_fld_phrase" Module="Core" Type="0">UGhyYXNl</PHRASE>
@@ -192,6 +195,7 @@
 			<PHRASE Label="lu_fld_translation" Module="Core" Type="0">VHJhbnNsYXRpb24=</PHRASE>
 			<PHRASE Label="lu_fld_UserGroup" Module="Core" Type="0">TWVtYmVyc2hpcCBHcm91cA==</PHRASE>
 			<PHRASE Label="lu_fld_Username" Module="Core" Type="0">VXNlcm5hbWU=</PHRASE>
+			<PHRASE Label="lu_fld_VerifyNewPassword" Module="Core" Type="0">UmVwZWF0IE5ldyBQYXNzd29yZA==</PHRASE>
 			<PHRASE Label="lu_fld_VerifyPassword" Module="Core" Type="0">VmVyaWZ5IFBhc3N3b3Jk</PHRASE>
 			<PHRASE Label="lu_fld_version" Module="Core" Type="0">VmVyc2lvbg==</PHRASE>
 			<PHRASE Label="lu_fld_Zip" Module="Core" Type="0">WmlwIGNvZGU=</PHRASE>
@@ -295,8 +299,9 @@
 			<PHRASE Label="lu_TermAndCondition" Module="Core" Type="0">VGVybXMgYW5kIENvbmRpdGlvbnMgb2YgVXNl</PHRASE>
 			<PHRASE Label="lu_TextUnsubscribe" Module="Core" Type="0">IFdlIGFyZSBzb3JyeSB5b3UgaGF2ZSB1bnN1YnNjcmliZWQgZnJvbSBvdXIgbWFpbGluZyBsaXN0</PHRASE>
 			<PHRASE Label="lu_text_DisabledAccountWarning" Module="Core" Type="0">WW91ciB1c2VyIGFjY291bnQgaXMgY3VycmVudGx5IHBlbmRpbmcgb3IgZGlzYWJsZWQuIElmIHlvdSBoYXZlIHJlZ2lzdHJlZCByZWNlbnRseSwgcGxlYXNlIHdhaXQgdW50aWwgeW91ciBhY2NvdW50IHdpbGwgYmUgYXBwcm92ZWQsIG90aGVyd2lzZSBwbGVhc2Ugd3JpdGU=</PHRASE>
-			<PHRASE Label="lu_text_ForgotPassHasBeenReset" Module="Core" Type="0">WW91ciBwYXNzd29yZCBoYXMgYmVlbiByZXNldC4gVGhlIG5ldyBwYXNzd29yZCBoYXMgYmVlbiBzZW50IHRvIHlvdXIgZS1tYWlsIGFkZHJlc3MuIFlvdSBtYXkgbm93IGxvZ2luIHdpdGggdGhlIG5ldyBwYXNzd29yZC4=</PHRASE>
-			<PHRASE Label="lu_text_ForgotPassResetEmailSent" Module="Core" Type="0">WW91IGhhdmUgY2hvc2VuIHRvIHJlc2V0IHlvdXIgcGFzc3dvcmQuPEJSLz48QlIvPg0KQW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhlIGVtYWlsIGluIG9yZGVyIHRvIHJlY2VpdmUgYSBuZXcgcGFzc3dvcmQu</PHRASE>
+			<PHRASE Label="lu_text_ForgotPassHasBeenReset" Module="Core" Type="0">WW91ciBwYXNzd29yZCBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY2hhbmdlZC4=</PHRASE>
+			<PHRASE Label="lu_text_ForgotPassResetChangeForm" Module="Core" Type="0">UGxlYXNlIGVudGVyIHlvdXIgbmV3IHBhc3N3b3Jk</PHRASE>
+			<PHRASE Label="lu_text_ForgotPassResetEmailSent" Module="Core" Type="0">WW91IGhhdmUgY2hvc2VuIHRvIHJlc2V0IHlvdXIgcGFzc3dvcmQuPEJSLz48QlIvPg0KQW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhhdCBlbWFpbCB0byBzZXQgeW91ciBuZXcgcGFzc3dvcmQu</PHRASE>
 			<PHRASE Label="lu_text_KeywordsTooShort" Module="Core" Type="0">VGhlIGtleXdvcmQgaXMgdG9vIHNob3J0</PHRASE>
 			<PHRASE Label="lu_text_NoComments" Module="Core" Type="0">Tm8gY29tbWVudHMsIGFkZCBmaXJzdA==</PHRASE>
 			<PHRASE Label="lu_text_NoPermission" Module="Core" Type="0">Tm8gcGVybWlzc2lvbnMgdG8gcGVyZm9ybSB0aGlzIG9wZXJhdGlvbg==</PHRASE>
@@ -328,6 +333,10 @@
 			<PHRASE Label="lu_title_ForgotPassword" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3Jk</PHRASE>
 			<PHRASE Label="lu_title_forgotpasswordconfirm" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIENvbmZpcm1hdGlvbg==</PHRASE>
 			<PHRASE Label="lu_title_ForgotPasswordNotification" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIE5vdGlmaWNhdGlvbg==</PHRASE>
+			<PHRASE Label="lu_title_ForgotPasswordStep1" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDEgb2YgNCk=</PHRASE>
+			<PHRASE Label="lu_title_ForgotPasswordStep2" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDIgb2YgNCk=</PHRASE>
+			<PHRASE Label="lu_title_ForgotPasswordStep3" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDMgb2YgNCk=</PHRASE>
+			<PHRASE Label="lu_title_ForgotPasswordStep4" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDQgb2YgNCk=</PHRASE>
 			<PHRASE Label="lu_title_LoginBox" Module="Core" Type="0">TG9naW4gQm94</PHRASE>
 			<PHRASE Label="lu_title_mailinglist" Module="Core" Type="0">TWFpbGluZyBMaXN0</PHRASE>
 			<PHRASE Label="lu_title_MaintenanceMode" Module="Core" Type="0">TWFpbnRlbmFuY2UgTW9kZQ==</PHRASE>
@@ -390,4 +399,4 @@
 			<PHRASE Label="lu_ZipCode" Module="Core" Type="0">WklQIENvZGU=</PHRASE>
 		</PHRASES>
 	</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file
+</LANGUAGES>
Index: themes/advanced/platform/login/forgot_password.tpl
===================================================================
--- themes/advanced/platform/login/forgot_password.tpl
+++ themes/advanced/platform/login/forgot_password.tpl
@@ -6,7 +6,7 @@
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ForgotPassword" no_editing="1"/>
+	<inp2:m_phrase name="lu_title_ForgotPasswordStep1" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
@@ -33,13 +33,13 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPassword" templates="platform/login/forgot_password"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordStep1" templates="platform/login/forgot_password"/>
 		</div>
 		<div class="movable-element">
 			<!-- forgot password -->
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ForgotPassword"/>
+					<inp2:m_phrase name="lu_title_ForgotPasswordStep1"/>
 				</inp2:m_Capture>
 
 				<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
@@ -61,7 +61,7 @@
 							<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_notice"/>
 							<input type="hidden" name="reset_confirm_template" value="platform/login/forgot_password_reset"/>
 
-							<input type="submit" class="button" name="events[u.forgot][OnForgotPassword]" value="<inp2:m_Phrase label='lu_btn_SendPassword' no_editing='1'/>" />
+							<input type="submit" class="button" name="events[u.forgot][OnForgotPassword]" value="<inp2:m_Phrase label='lu_btn_Continue' no_editing='1'/>" />
 							<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
 						</inp2:m_RenderElement>
 					</table>
@@ -75,4 +75,4 @@
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
+<!--## /DESIGN TEMPLATE ##-->
Index: themes/advanced/platform/login/forgot_password_reset.tpl
===================================================================
--- themes/advanced/platform/login/forgot_password_reset.tpl
+++ themes/advanced/platform/login/forgot_password_reset.tpl
@@ -6,7 +6,7 @@
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_PasswordRequestConfirm" no_editing="1"/>
+	<inp2:m_phrase name="lu_title_ForgotPasswordStep3" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
@@ -33,27 +33,27 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_PasswordRequestConfirm" templates="platform/login/forgot_password_reset"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordStep3" templates="platform/login/forgot_password_reset"/>
 		</div>
 		<div class="movable-element">
 			<!-- forgot password reset -->
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_PasswordRequestConfirm"/>
+					<inp2:m_phrase name="lu_title_ForgotPasswordStep3"/>
 				</inp2:m_Capture>
 
-				<inp2:m_Phrase label="lu_text_PasswordRequestConfirm"/>
+				<inp2:m_Phrase label="lu_text_ForgotPassResetChangeForm"/>
 
 				<br /><br />
 
 				<inp2:m_if check="u_TestCodeIsValid">
 					<form method="POST" action="<inp2:m_FormAction />">
 						<table class="form-data fullwidth">
-							<inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="Password" title="lu_fld_Password" style="width:155px" />
-							<inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" is_last="1"/>
+							<inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="Password" title="lu_fld_NewPassword" style="width:155px" />
+							<inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="VerifyPassword" title="lu_fld_VerifyNewPassword" style="width:155px" is_last="1"/>
 
 							<inp2:m_RenderElement design="inp_edit_buttons">
-								<input class="button" type="submit" name="events[u.forgot][OnResetLostPassword]" value="<inp2:m_Phrase label='lu_btn_Update' no_editing='1'/>"/>
+								<input class="button" type="submit" name="events[u.forgot][OnResetLostPassword]" value="<inp2:m_Phrase label='lu_btn_SetNewPassword' no_editing='1'/>"/>
 								<input type="hidden" name="next_template" value="platform/login/forgot_password_reset_confirm"/>
 							</inp2:m_RenderElement>
 						</table>
@@ -74,4 +74,4 @@
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
+<!--## /DESIGN TEMPLATE ##-->
Index: themes/advanced/platform/login/forgot_password_reset_confirm.tpl
===================================================================
--- themes/advanced/platform/login/forgot_password_reset_confirm.tpl
+++ themes/advanced/platform/login/forgot_password_reset_confirm.tpl
@@ -6,7 +6,7 @@
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ForgotPasswordConfirm" no_editing="1"/>
+	<inp2:m_phrase name="lu_title_ForgotPasswordStep4" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
@@ -33,13 +33,13 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordConfirm" templates="platform/login/forgot_password_reset_confirm"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordStep4" templates="platform/login/forgot_password_reset_confirm"/>
 		</div>
 		<div class="movable-element">
 			<!-- forgot password reset confirm -->
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ForgotPasswordConfirm"/>
+					<inp2:m_phrase name="lu_title_ForgotPasswordStep4"/>
 				</inp2:m_Capture>
 
 				<form method="POST" action="<inp2:m_FormAction />">
@@ -58,4 +58,4 @@
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
+<!--## /DESIGN TEMPLATE ##-->
Index: themes/advanced/platform/login/forgot_password_reset_notice.tpl
===================================================================
--- themes/advanced/platform/login/forgot_password_reset_notice.tpl
+++ themes/advanced/platform/login/forgot_password_reset_notice.tpl
@@ -6,7 +6,7 @@
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
-	<inp2:m_phrase name="lu_title_ForgotPasswordNotification" no_editing="1"/>
+	<inp2:m_phrase name="lu_title_ForgotPasswordStep2" no_editing="1"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
@@ -33,21 +33,16 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordNotification" templates="platform/login/forgot_password_reset_notice"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordStep2" templates="platform/login/forgot_password_reset_notice"/>
 		</div>
 		<div class="movable-element">
 			<!-- forgot password reset confirm -->
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_ForgotPasswordNotification"/>
+					<inp2:m_Phrase name="lu_title_ForgotPasswordStep2"/>
 				</inp2:m_Capture>
 
-				<form method="POST" action="<inp2:m_FormAction />">
-					<inp2:m_Phrase label="lu_text_ForgotPassResetEmailSent"/>
-					<br /><br />
-
-					<input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');"/>
-				</form>
+				<inp2:m_Phrase name="lu_text_ForgotPassResetEmailSent"/>
 			</inp2:m_RenderElement>
 			<!-- // forgot password reset confirm -->
 		</div>
@@ -57,4 +52,4 @@
 
 <!--## DESIGN TEMPLATE ##-->
 <inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
+<!--## /DESIGN TEMPLATE ##-->