diff --git a/app/Http/Controllers/Auth/ChangePasswordController.php b/app/Http/Controllers/Auth/ChangePasswordController.php
new file mode 100644
index 0000000..e5f7309
--- /dev/null
+++ b/app/Http/Controllers/Auth/ChangePasswordController.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class ChangePasswordController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function getChangePassword()
+    {
+        return view('auth.passwords.change');
+    }
+
+    protected function postChangePassword(Request $req)
+    {
+        $this->validate($req, [
+            'old_password' => 'required',
+            'password' => 'required|between:6,15|confirmed',
+            'password_confirmation' => 'required',
+        ], [
+            'old_password.required' => 'Password lama harus diisi.',
+            'password.required' => 'Password baru harus diisi.',
+            'password.between' => 'Password baru harus antara 6 - 15 karakter.',
+            'password.confirmed' => 'Konfirmasi password baru tidak sesuai.',
+            'password_confirmation.required' => 'Konfirmasi password baru harus diisi.',
+        ]);
+
+        $input = $req->except('_token');
+
+        if (app('hash')->check($input['old_password'], auth()->user()->password))
+        {
+            $user = auth()->user();
+            $user->password = $input['password'];
+            $user->save();
+
+            flash()->success(trans('auth.old_password_success'));
+            return back();
+        }
+
+        flash()->error(trans('auth.old_password_failed'));
+        return back();
+
+    }
+
+}
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
deleted file mode 100644
index 17c0a64..0000000
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\User;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Support\Facades\Validator;
-
-class RegisterController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Register Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users as well as their
-    | validation and creation. By default this controller uses a trait to
-    | provide this functionality without requiring any additional code.
-    |
-    */
-
-    use RegistersUsers;
-
-    /**
-     * Where to redirect users after registration.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param array $data
-     *
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name'     => 'required|string|max:255',
-            'email'    => 'required|string|email|max:255|unique:users',
-            'password' => 'required|string|min:6|confirmed',
-        ]);
-    }
-
-    /**
-     * Create a new user instance after a valid registration.
-     *
-     * @param array $data
-     *
-     * @return User
-     */
-    protected function create(array $data)
-    {
-        return User::create([
-            'name'     => $data['name'],
-            'email'    => $data['email'],
-            'password' => bcrypt($data['password']),
-        ]);
-    }
-}
diff --git a/resources/views/auth/passwords/change.blade.php b/resources/views/auth/passwords/change.blade.php
new file mode 100644
index 0000000..f687d38
--- /dev/null
+++ b/resources/views/auth/passwords/change.blade.php
@@ -0,0 +1,22 @@
+@extends('layouts.app')
+
+@section('title', trans('auth.change_password'))
+
+@section('content')
+<div class="col-md-6 col-md-offset-3">
+    <div class="panel panel-default">
+        <div class="panel-heading"><h3 class="panel-title">{{ trans('auth.change_password') }}</h3></div>
+        {!! Form::open(['route'=>'change-password']) !!}
+        <div class="panel-body">
+            {!! FormField::password('old_password', ['label'=> trans('auth.old_password')]) !!}
+            {!! FormField::password('password', ['label'=>trans('auth.new_password')]) !!}
+            {!! FormField::password('password_confirmation', ['label'=>trans('auth.new_password_confirmation')]) !!}
+        </div>
+        <div class="panel-footer">
+            {!! Form::submit(trans('auth.change_password'), ['class'=>'btn btn-info']) !!}
+            {!! link_to_route('home',trans('app.cancel'),[],['class'=>'btn btn-default']) !!}
+        </div>
+        {!! Form::close() !!}
+    </div>
+</div>
+@endsection
diff --git a/resources/views/layouts/partials/top-nav.blade.php b/resources/views/layouts/partials/top-nav.blade.php
index dc2d61f..1877403 100644
--- a/resources/views/layouts/partials/top-nav.blade.php
+++ b/resources/views/layouts/partials/top-nav.blade.php
@@ -55,6 +55,7 @@
                     <ul class="dropdown-menu" role="menu">
                         <li>{{ link_to_route('users.index', trans('user.list')) }}</li>
                         <li>{{ link_to_route('backups.index', trans('backup.list')) }}</li>
+                        <li>{{ link_to_route('change-password', trans('auth.change_password')) }}</li>
                         <li>
                             <a href="{{ route('logout') }}"
                             onclick="event.preventDefault();
diff --git a/routes/web.php b/routes/web.php
index 90c667a..ea5ca63 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -20,6 +20,10 @@ Route::get('login', 'Auth\LoginController@showLoginForm')->name('login');
 Route::post('login', 'Auth\LoginController@login');
 Route::post('logout', 'Auth\LoginController@logout')->name('logout');
 
+// Change Password Routes...
+Route::get('change-password', 'Auth\ChangePasswordController@getChangePassword')->name('change-password');
+Route::post('change-password', 'Auth\ChangePasswordController@postChangePassword')->name('change-password');
+
 Route::group(['middleware' => 'auth'], function () {
     /*
      * Pages Routes
diff --git a/tests/Feature/Auth/UserChangePasswordTest.php b/tests/Feature/Auth/UserChangePasswordTest.php
new file mode 100644
index 0000000..3f9d8b1
--- /dev/null
+++ b/tests/Feature/Auth/UserChangePasswordTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Feature\Auth;
+
+use App\User;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Tests\BrowserKitTestCase;
+
+class UserChangePasswordTest extends BrowserKitTestCase
+{
+    use DatabaseMigrations;
+
+    /** @test */
+    public function user_can_change_password()
+    {
+        $user = factory(User::class)->make(['username' => '123456']);
+        $this->actingAs($user);
+        $this->visit(route('change-password'));
+
+        $this->type('secret','old_password');
+        $this->type('member','password');
+        $this->type('member','password_confirmation');
+        $this->press(trans('auth.change_password'));
+        $this->see(trans('auth.old_password_success'));
+        $this->seePageIs(route('change-password'));
+
+        $this->assertTrue(app('hash')->check('member', $user->password));
+    }
+}