diff --git a/app/views/frontend/account/change-email.blade.php b/app/views/frontend/account/change-email.blade.php
index 56c285b1ef..89e8b7f902 100755
--- a/app/views/frontend/account/change-email.blade.php
+++ b/app/views/frontend/account/change-email.blade.php
@@ -66,8 +66,7 @@ Change your Email
         <label class="col-md-2 control-label"></label>
             <div class="col-md-7">
                 <a class="btn btn-link" href="{{ route('view-assets') }}">@lang('button.cancel')</a>
-                <button type="submit" class="btn btn-success"><i class="fa fa-ok icon-white"></i> @lang('general.save')</button>
-                <a href="{{ route('forgot-password') }}" class="btn btn-link">I forgot my password</a>
+                <button type="submit" class="btn btn-success" {{ ((Config::get('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}><i class="fa fa-check icon-white"></i> @lang('general.save')</button>
             </div>
         </div>
 
diff --git a/app/views/frontend/account/change-password.blade.php b/app/views/frontend/account/change-password.blade.php
index d7849ffd12..3c7c127329 100755
--- a/app/views/frontend/account/change-password.blade.php
+++ b/app/views/frontend/account/change-password.blade.php
@@ -60,10 +60,9 @@ Change your Password
 	<label class="col-md-2 control-label"></label>
 		<div class="col-md-7">
 			<a class="btn btn-link" href="{{ route('view-assets') }}">@lang('button.cancel')</a>
-			<button type="submit" class="btn btn-success"><i class="fa fa-ok icon-white"></i> @lang('general.save')</button>
-			<a href="{{ route('forgot-password') }}" class="btn btn-link">I forgot my password</a>
+			<button type="submit" class="btn btn-success" {{ ((Config::get('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}><i class="fa fa-check icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 
 </form>
-@stop
\ No newline at end of file
+@stop