diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 7beab2c92cb9..b80a59b86450 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -676,7 +676,7 @@ class AccountController extends BaseController
         $user->last_name = trim(Input::get('new_last_name'));
         $user->email = trim(strtolower(Input::get('new_email')));
         $user->username = $user->email;
-        $user->password = trim(Input::get('new_password'));
+        $user->password = bcrypt(trim(Input::get('new_password')));
         $user->registered = true;
         $user->save();
 
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index e4d3d512bfa1..19f3708fee64 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -336,7 +336,7 @@ class UserController extends BaseController
 
         // save the new password
         $user = Auth::user();
-        $user->password = $password;
+        $user->password = bcrypt($password);
         $user->save();
 
         return RESULT_SUCCESS;
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index 08a4e5d50a63..d6789909c4c5 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -165,7 +165,7 @@ class Utils
             'user_agent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '',
             'ip' => Request::getClientIp(),
             'count' => Session::get('error_count', 0),
-            'input' => Input::all()
+            //'input' => Input::all()
         ];
 
         Log::error($error."\n", $data);
diff --git a/resources/lang/da/texts.php b/resources/lang/da/texts.php
index 20a2071c809c..20c38f824130 100644
--- a/resources/lang/da/texts.php
+++ b/resources/lang/da/texts.php
@@ -584,5 +584,7 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
     
 );
diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 5b1da59faecd..3d655b318564 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -575,6 +575,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
     
 
 );
diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php
index 5cedb7aa5154..eb26690bf8da 100644
--- a/resources/lang/es/texts.php
+++ b/resources/lang/es/texts.php
@@ -554,6 +554,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
   
 
 
diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php
index 94836f2f68d0..3de369f585cc 100644
--- a/resources/lang/fr/texts.php
+++ b/resources/lang/fr/texts.php
@@ -575,6 +575,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
   
 
 );
\ No newline at end of file
diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php
index 83af0c1028a8..271fbf6c931b 100644
--- a/resources/lang/it/texts.php
+++ b/resources/lang/it/texts.php
@@ -577,6 +577,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
     
     
 );
diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php
index 96ab93f6d9ae..f146689e9a0f 100644
--- a/resources/lang/lt/texts.php
+++ b/resources/lang/lt/texts.php
@@ -585,6 +585,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
     
 
     
diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php
index ec63a0dbfc5a..36ea3d406659 100644
--- a/resources/lang/nb_NO/texts.php
+++ b/resources/lang/nb_NO/texts.php
@@ -583,6 +583,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
     
   
 );
\ No newline at end of file
diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php
index e4634a64f09b..433da85070b9 100644
--- a/resources/lang/nl/texts.php
+++ b/resources/lang/nl/texts.php
@@ -578,6 +578,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
     
 
   
diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php
index 639eae4378ff..328ee77f8aa5 100644
--- a/resources/lang/pt_BR/texts.php
+++ b/resources/lang/pt_BR/texts.php
@@ -578,6 +578,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
     
   
 );
diff --git a/resources/lang/sv/texts.php b/resources/lang/sv/texts.php
index 3185222c1eed..acea328b30a6 100644
--- a/resources/lang/sv/texts.php
+++ b/resources/lang/sv/texts.php
@@ -581,6 +581,8 @@ return array(
   'email_approved' => 'Email me when a quote is <b>approved</b>',
   'notification_quote_approved_subject' => 'Quote :invoice was approved by :client',
   'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.',
+  'resend_confirmation' => 'Resend confirmation email',
+  'confirmation_resent' => 'The confirmation email was resent',
   
   
 );
diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php
index 8cc1515e7a3d..592a147042df 100644
--- a/resources/views/accounts/details.blade.php
+++ b/resources/views/accounts/details.blade.php
@@ -104,7 +104,7 @@
                     &nbsp;
 
                     {!! Former::password('current_password')->style('width:300px') !!}
-                    {!! Former::password('new_password')->style('width:300px') !!}
+                    {!! Former::password('newer_password')->style('width:300px')->label(trans('texts.new_password')) !!}
                     {!! Former::password('confirm_password')->style('width:300px') !!}
 
                     &nbsp;
@@ -158,7 +158,7 @@
 			$('#country_id').combobox();
 
             $('#passwordModal').on('hidden.bs.modal', function () {                
-                $(['current_password', 'new_password', 'confirm_password']).each(function(i, field) {
+                $(['current_password', 'newer_password', 'confirm_password']).each(function(i, field) {
                     var $input = $('form #'+field);
                     $input.val('');
                     $input.closest('div.form-group').removeClass('has-success');                    
@@ -193,13 +193,13 @@
         function validateChangePassword(showError) 
         {
             var isFormValid = true;
-            $(['current_password', 'new_password', 'confirm_password']).each(function(i, field) {
+            $(['current_password', 'newer_password', 'confirm_password']).each(function(i, field) {
                 var $input = $('form #'+field),
                 val = $.trim($input.val());
                 var isValid = val && val.length >= 6;
 
                 if (isValid && field == 'confirm_password') {
-                    isValid = val == $.trim($('#new_password').val());
+                    isValid = val == $.trim($('#newer_password').val());
                 }
 
                 if (isValid) {
@@ -229,9 +229,9 @@
 
             $.ajax({
               type: 'POST',
-              url: '{{ URL::to('users/change_password') }}',
+              url: '{{ URL::to('/users/change_password') }}',
               data: 'current_password=' + encodeURIComponent($('form #current_password').val()) + 
-              '&new_password=' + encodeURIComponent($('form #new_password').val()) + 
+              '&new_password=' + encodeURIComponent($('form #newer_password').val()) + 
               '&confirm_password=' + encodeURIComponent($('form #confirm_password').val()),
               success: function(result) { 
                 if (result == 'success') {