diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 6d9d5b4..14d22c5 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -119,6 +119,20 @@ class UsersController extends Controller
      */
     public function update(Request $request, User $user)
     {
+        $this->validate($request, [
+            'nickname'  => 'required|string|max:255',
+            'name'      => 'required|string|max:255',
+            'gender_id' => 'required|numeric',
+            'dob'       => 'nullable|date|date_format:Y-m-d',
+            'dod'       => 'nullable|date|date_format:Y-m-d',
+            'yod'       => 'nullable|date_format:Y',
+            'phone'     => 'nullable|string|max:255',
+            'address'   => 'nullable|string|max:255',
+            'city'      => 'nullable|string|max:255',
+            'email'     => 'nullable|string|max:255',
+            'password'  => 'nullable|min:6|max:15',
+        ]);
+
         $user->nickname = $request->nickname;
         $user->name = $request->get('name');
         $user->gender_id = $request->get('gender_id');
diff --git a/composer.lock b/composer.lock
index 5addda9..679a507 100644
--- a/composer.lock
+++ b/composer.lock
@@ -237,16 +237,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.4.27",
+            "version": "v5.4.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "66f5e1b37cbd66e730ea18850ded6dc0ad570404"
+                "reference": "442511fc62121085d184355e4f964c88942bbecb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/66f5e1b37cbd66e730ea18850ded6dc0ad570404",
-                "reference": "66f5e1b37cbd66e730ea18850ded6dc0ad570404",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/442511fc62121085d184355e4f964c88942bbecb",
+                "reference": "442511fc62121085d184355e4f964c88942bbecb",
                 "shasum": ""
             },
             "require": {
@@ -362,7 +362,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2017-06-15T19:08:25+00:00"
+            "time": "2017-06-30T13:43:07+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -781,16 +781,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v3.0.5",
+            "version": "v3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d"
+                "reference": "0808939f81c1347a3c8a82a5925385a08074b0f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2b9e2f71b722f7c53918ab0c25f7646c2013f17d",
-                "reference": "2b9e2f71b722f7c53918ab0c25f7646c2013f17d",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0808939f81c1347a3c8a82a5925385a08074b0f1",
+                "reference": "0808939f81c1347a3c8a82a5925385a08074b0f1",
                 "shasum": ""
             },
             "require": {
@@ -828,7 +828,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2017-03-05T18:23:57+00:00"
+            "time": "2017-06-28T20:53:48+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1983,16 +1983,16 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v2.4.0",
+            "version": "v2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "de15d00a74696db62e1b4782474c27ed0c4fc763"
+                "reference": "af98b3a4ccac9364f2145fae974ff3392ec402b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/de15d00a74696db62e1b4782474c27ed0c4fc763",
-                "reference": "de15d00a74696db62e1b4782474c27ed0c4fc763",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/af98b3a4ccac9364f2145fae974ff3392ec402b1",
+                "reference": "af98b3a4ccac9364f2145fae974ff3392ec402b1",
                 "shasum": ""
             },
             "require": {
@@ -2041,7 +2041,7 @@
                 "profiler",
                 "webprofiler"
             ],
-            "time": "2017-06-01T17:46:08+00:00"
+            "time": "2017-06-14T07:44:44+00:00"
         },
         {
             "name": "doctrine/instantiator",
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 9173197..a2e0f57 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -1,10 +1,12 @@
 @extends('layouts.app')
 
 @section('content')
-    <div class="pull-right">
-        {{ link_to_route('users.chart', 'Lihat Chart Keluarga '.$user->name, [$user->id], ['class' => 'btn btn-default']) }}
-    </div>
-    <h3 class="page-header text-center">Edit Profil {{ $user->profileLink() }}</h3>
+    <h2 class="page-header">
+        <div class="pull-right">
+            {{ link_to_route('users.show', 'Lihat Profil '.$user->name, [$user->id], ['class' => 'btn btn-default']) }}
+        </div>
+        Edit Profil {{ $user->profileLink() }}
+    </h2>
     {{ Form::model($user, ['route' => ['users.update', $user->id], 'method' =>'patch']) }}
     <div class="row">
         <div class="col-md-4">
@@ -39,13 +41,14 @@
                 <div class="panel-heading"><h3 class="panel-title">Akun Login</h3></div>
                 <div class="panel-body">
                     {!! FormField::email('email', ['label' => 'Email', 'placeholder' => 'Misal: nama@mail.com']) !!}
-                    {!! FormField::text('password', ['label' => 'Password', 'placeholder' => '******']) !!}
+                    {!! FormField::password('password', ['label' => 'Password', 'placeholder' => '******']) !!}
                 </div>
             </div>
         </div>
     </div>
     <div class="pull-right">
         {{ Form::submit('Update', ['class' => 'btn btn-primary']) }}
+        {{ link_to_route('users.show', 'Cancel', [$user->id], ['class' => 'btn btn-default']) }}
     </div>
     {{ Form::close() }}
 @endsection