diff --git a/app/Http/Controllers/Shop/CustomerController.php b/app/Http/Controllers/Shop/CustomerController.php
index 1c0ac6b7..fc14f0a5 100644
--- a/app/Http/Controllers/Shop/CustomerController.php
+++ b/app/Http/Controllers/Shop/CustomerController.php
@@ -8,6 +8,7 @@ use App\Repositories\Shop\CustomerAddresses;
 use App\Repositories\Shop\Customers;
 use App\Repositories\Shop\Offers;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Validator;
 
@@ -117,9 +118,52 @@ class CustomerController extends Controller
     public function store(Request $request)
     {
         $data = $request->all();
+
+        $passwordError = $this->handlePasswordChange($request);
+        if ($passwordError) {
+            return redirect()->route('Shop.Customers.edit')
+                ->with('growl', [$passwordError, 'danger']);
+        }
+
+        unset($data['current-password'], $data['new-password'], $data['new-password_confirmation']);
+
         $customer = Customers::storeFull($data);
 
-        return redirect()->route('Shop.Customers.edit');
+        $growl = $request->filled('new-password')
+            ? [__('Profil et mot de passe mis à jour.'), 'success']
+            : [__('Profil mis à jour.'), 'success'];
+
+        return redirect()->route('Shop.Customers.edit')->with('growl', $growl);
+    }
+
+    protected function handlePasswordChange(Request $request)
+    {
+        if (! $request->filled('new-password')) {
+            return null;
+        }
+
+        $customer = Customers::get(Customers::getId());
+
+        if (! $customer) {
+            return __('Impossible de modifier le mot de passe.');
+        }
+
+        if (! Hash::check($request->input('current-password'), $customer->password)) {
+            return __('Le mot de passe actuel est incorrect.');
+        }
+
+        if ($request->input('new-password') !== $request->input('new-password_confirmation')) {
+            return __('Les mots de passe ne correspondent pas.');
+        }
+
+        if (strlen($request->input('new-password')) < 8) {
+            return __('Le nouveau mot de passe doit contenir au moins 8 caractères.');
+        }
+
+        $customer->password = Hash::make($request->input('new-password'));
+        $customer->save();
+
+        return null;
     }
 
     public function storeAddress(Request $request)
diff --git a/resources/views/Shop/auth/passwords/password_confirmation.blade.php b/resources/views/Shop/auth/passwords/password_confirmation.blade.php
index 73c002e3..cfdd58ec 100644
--- a/resources/views/Shop/auth/passwords/password_confirmation.blade.php
+++ b/resources/views/Shop/auth/passwords/password_confirmation.blade.php
@@ -13,7 +13,7 @@
     <label for="new-password" class="col-md-6 control-label text-right">Nouveau mot de passe</label>
 
     <div class="col-md-6">
-        <input id="new-password" type="password" class="form-control" name="new-password" required>
+        <input id="new-password" type="password" class="form-control" name="new-password">
     </div>
 </div>
 
@@ -21,6 +21,6 @@
     <label for="new-password-confirm" class="col-md-6 control-label text-right">Confirmez votre mot de passe</label>
 
     <div class="col-md-6">
-        <input id="new-password-confirm" type="password" class="form-control" name="new-password_confirmation" required>
+        <input id="new-password-confirm" type="password" class="form-control" name="new-password_confirmation">
     </div>
 </div>