diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 3aa627e..c8d019d 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -68,7 +68,9 @@ class UsersController extends Controller
     {
         $this->authorize('update', $user);
 
-        return view('users.edit', compact('user'));
+        $langList = ['en' => trans('lang.en'), 'id' => trans('lang.id')];
+
+        return view('users.edit', compact('user', 'langList'));
     }
 
     public function update(Request $request, User $user)
@@ -80,6 +82,7 @@ class UsersController extends Controller
             'email'    => 'required|email|unique:users,email,'.$request->segment(2),
             'password' => 'nullable|required_with:password_confirmation|between:6,15',
             'role'     => 'required|array',
+            'lang'     => 'required|string|in:en,id',
         ]);
 
         $user->update($userData);
diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php
index 5a2ff71..056e82e 100644
--- a/resources/lang/en/user.php
+++ b/resources/lang/en/user.php
@@ -5,12 +5,13 @@ return [
     'user'          => 'User',
     'list'          => 'User List',
     'user_id'       => 'User ID',
-    'profile'       => 'User Profile',
+    'profile'       => 'Profile',
     'search'        => 'Search User: ketik nama',
     'search'        => 'Type user name then hit Enter..',
     'found'         => 'User found.',
     'not_found'     => 'User not found.',
     'empty'         => 'User list is empty.',
+    'back_to_show'  => 'Back to User Profile',
     'back_to_index' => 'Back to User List',
 
     // Actions
diff --git a/resources/lang/id/user.php b/resources/lang/id/user.php
index 294082b..a72dbc4 100644
--- a/resources/lang/id/user.php
+++ b/resources/lang/id/user.php
@@ -5,12 +5,13 @@ return [
     'user'          => 'User',
     'list'          => 'Daftar User',
     'user_id'       => 'User ID',
-    'profile'       => 'Profil User',
+    'profile'       => 'Profil',
     'search'        => 'Cari User: ketik nama',
     'search'        => 'Ketik nama user lalu tekan Enter..',
     'found'         => 'User ditemukan',
     'not_found'     => 'User tidak ditemukan',
     'empty'         => 'Belum ada User',
+    'back_to_show'  => 'Kembali ke Profil User',
     'back_to_index' => 'Kembali ke Daftar User',
 
     // Actions
diff --git a/resources/views/layouts/user.blade.php b/resources/views/layouts/user.blade.php
new file mode 100755
index 0000000..e9a08c2
--- /dev/null
+++ b/resources/views/layouts/user.blade.php
@@ -0,0 +1,17 @@
+@extends('layouts.app')
+
+@section('title')
+{{ $user->name }} - @yield('subtitle', trans('user.profile'))
+@endsection
+
+@section('content')
+<h1 class="page-header">
+    <div class="pull-right">
+        {!! link_to_route('users.edit', trans('user.edit'), [$user], ['id' => 'edit-user-' . $user->id, 'class' => 'btn btn-warning']) !!}
+        {!! link_to_route('users.index', trans('user.back_to_index'), [], ['class' => 'btn btn-default']) !!}
+    </div>
+    {{ $user->name }} <small>@yield('subtitle', trans('user.profile'))</small>
+</h1>
+@include('users.partials.nav-tabs')
+@yield('content-user')
+@endsection
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index a94c7dc..cadbf05 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -1,14 +1,13 @@
 @inject('roles', 'App\Entities\Users\Role')
-@extends('layouts.dashboard')
+@extends('layouts.user')
 
-@section('title', trans('user.edit'))
+@section('subtitle', trans('user.edit'))
 
-@section('content-dashboard')
-{!! Form::model($user, ['route'=>['users.update', $user->id], 'method' => 'patch']) !!}
+@section('content-user')
+{!! Form::model($user, ['route'=>['users.update', $user->id], 'method' => 'patch', 'autocomplete' => 'off']) !!}
 <div class="row">
     <div class="col-md-6">
         <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{{ $user->name }} - {{ trans('user.edit') }}</h3></div>
             <div class="panel-body">
                 {!! FormField::text('name', ['label' => trans('app.name')]) !!}
                 {!! FormField::email('email', ['label' => trans('user.email')]) !!}
@@ -24,10 +23,11 @@
                         'class' => 'info',
                     ],
                 ]) !!}
+                {!! FormField::radios('lang', $langList, ['label' => trans('lang.lang')]) !!}
             </div>
             <div class="panel-footer">
                 {!! Form::submit(trans('user.update'), ['class'=>'btn btn-warning']) !!}
-                {!! link_to_route('users.show', trans('app.show'), [$user->id], ['class' => 'btn btn-info']) !!}
+                {!! link_to_route('users.show', trans('user.back_to_show'), [$user->id], ['class' => 'btn btn-info']) !!}
                 {!! link_to_route('users.index', trans('user.back_to_index'), [], ['class' => 'btn btn-default']) !!}
                 {!! link_to_route('users.delete', trans('app.delete'), [$user->id], ['class'=>'btn btn-danger pull-right']) !!}
             </div>
@@ -36,3 +36,9 @@
 </div>
 {!! Form::close() !!}
 @endsection
+
+@section('script')
+<script>
+        $('#password').attr('autocomplete', 'new-password');
+</script>
+@endsection
diff --git a/resources/views/users/partials/nav-tabs.blade.php b/resources/views/users/partials/nav-tabs.blade.php
new file mode 100644
index 0000000..b91e7ff
--- /dev/null
+++ b/resources/views/users/partials/nav-tabs.blade.php
@@ -0,0 +1,7 @@
+<!-- Nav tabs -->
+<ul class="nav nav-tabs">
+    <li class="{{ Request::segment(3) == null ? 'active' : '' }}">
+        {!! link_to_route('users.show', trans('user.profile'), [$user]) !!}
+    </li>
+</ul>
+<br>
diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php
index 0ad167a..6df1db3 100755
--- a/resources/views/users/show.blade.php
+++ b/resources/views/users/show.blade.php
@@ -1,22 +1,16 @@
-@extends('layouts.dashboard')
+@extends('layouts.user')
 
-@section('title', trans('user.show'))
-
-@section('content-dashboard')
+@section('content-user')
 <div class="row">
     <div class="col-md-6">
         <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{{ $user->name }} - {{ trans('user.show') }}</h3></div>
-            <div class="panel-body">
-                <table class="table table-condensed">
-                    <tbody>
-                        <tr><th>{{ trans('app.name') }}</th><td>{{ $user->name }}</td></tr>
-                        <tr><th>{{ trans('user.email') }}</th><td>{{ $user->email }}</td></tr>
-                        <tr><th>{{ trans('user.role') }}</th><td>{!! $user->roleList() !!}</td></tr>
-                        <tr><th>{{ trans('user.registered_at') }}</th><td>{{ $user->created_at }}</td></tr>
-                    </tbody>
-                </table>
-            </div>
+            <table class="table">
+                <tr><th class="col-xs-3">{{ trans('user.user_id') }}</th><td>{{ $user->id }}</td></tr>
+                <tr><th>{{ trans('user.name') }}</th><td>{{ $user->name }}</td></tr>
+                <tr><th>{{ trans('user.email') }}</th><td>{{ $user->email }}</td></tr>
+                <tr><th>{{ trans('user.role') }}</th><td>{!! $user->roleList() !!}</td></tr>
+                <tr><th>{{ trans('lang.lang') }}</th><td>{{ trans('lang.'.$user->lang) }}</td></tr>
+            </table>
             <div class="panel-footer">
                 {!! link_to_route('users.edit', trans('user.edit'), [$user->id], ['class' => 'btn btn-warning']) !!}
                 {!! link_to_route('users.index', trans('user.back_to_index'), [], ['class' => 'btn btn-default']) !!}
diff --git a/tests/Feature/Users/ManageUsersTest.php b/tests/Feature/Users/ManageUsersTest.php
index 4936307..8df6fa1 100644
--- a/tests/Feature/Users/ManageUsersTest.php
+++ b/tests/Feature/Users/ManageUsersTest.php
@@ -87,6 +87,7 @@ class ManageUsersTest extends TestCase
             'email'    => 'member@mail.dev',
             'password' => 'password',
             'role'     => [1, 2], // Administrator, Worker
+            'lang'     => 'id',
         ]);
 
         $this->seePageIs(route('users.edit', $user2->id));
@@ -97,6 +98,7 @@ class ManageUsersTest extends TestCase
             'id'    => $user2->id,
             'name'  => 'Ganti nama User',
             'email' => 'member@mail.dev',
+            'lang'  => 'id',
         ]);
 
         $this->seeInDatabase('user_roles', [