From 7f2ccc860b5af8effdadff91119d5d9ffe9c0584 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Thu, 26 Mar 2015 05:38:56 +1030
Subject: [PATCH 1/4] Remove forgot password link and fix save icon

---
 app/views/frontend/account/change-password.blade.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/frontend/account/change-password.blade.php b/app/views/frontend/account/change-password.blade.php
index d7849ffd12..fdd9030242 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"><i class="fa fa-check icon-white"></i> @lang('general.save')</button>
 		</div>
 	</div>
 
 </form>
-@stop
\ No newline at end of file
+@stop

From d952a1199b285dd2c7de3567ea6f4d006c489920 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Thu, 26 Mar 2015 05:39:56 +1030
Subject: [PATCH 2/4] Remove forgot password link and fix save icon

---
 app/views/frontend/account/change-email.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/frontend/account/change-email.blade.php b/app/views/frontend/account/change-email.blade.php
index 56c285b1ef..df35572b67 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"><i class="fa fa-check icon-white"></i> @lang('general.save')</button>
             </div>
         </div>
 

From 6854c568c7ead1d81d05a0e5b8df68a5196aedfa Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Thu, 26 Mar 2015 05:53:58 +1030
Subject: [PATCH 3/4] Add if locked disable button

---
 app/views/frontend/account/change-email.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/frontend/account/change-email.blade.php b/app/views/frontend/account/change-email.blade.php
index df35572b67..89e8b7f902 100755
--- a/app/views/frontend/account/change-email.blade.php
+++ b/app/views/frontend/account/change-email.blade.php
@@ -66,7 +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-check icon-white"></i> @lang('general.save')</button>
+                <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>
 

From e2a2746ed668e4eab071d645295db760a22568e2 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Thu, 26 Mar 2015 05:54:14 +1030
Subject: [PATCH 4/4] Add if locked disable button

---
 app/views/frontend/account/change-password.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/frontend/account/change-password.blade.php b/app/views/frontend/account/change-password.blade.php
index fdd9030242..3c7c127329 100755
--- a/app/views/frontend/account/change-password.blade.php
+++ b/app/views/frontend/account/change-password.blade.php
@@ -60,7 +60,7 @@ 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-check icon-white"></i> @lang('general.save')</button>
+			<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>