diff --git a/resources/lang/en/admin/userManagement.php b/resources/lang/en/admin/userManagement.php
index 80247f37..81c2c6d6 100644
--- a/resources/lang/en/admin/userManagement.php
+++ b/resources/lang/en/admin/userManagement.php
@@ -17,6 +17,7 @@ return [
     'detail' => 'Details of user :name (:email)',
     'editUser' => 'Editing user :name (:email)',
     'usersActions' => 'User\'s actions',
-    'update' => 'Update informations'
+    'update' => 'Update informations',
+    'passwordLeaveEmpty' => 'Leave empty, if you do not want to change it.'
 
 ];
\ No newline at end of file
diff --git a/resources/views/admin/userManagement/detail.blade.php b/resources/views/admin/userManagement/detail.blade.php
index 01ff6ebc..c47f1540 100644
--- a/resources/views/admin/userManagement/detail.blade.php
+++ b/resources/views/admin/userManagement/detail.blade.php
@@ -10,7 +10,7 @@
         <div class="columns large-4">
             <div class="callout">
                 <div class="user-img text-center">
-                    <img src="{{$user->gravatar(350)}}" alt="" />
+                    <img src="{{$user->gravatar(200)}}" alt="" />
                 </div>
                 <div class="user-detail text-center">
                     <ul>
@@ -32,7 +32,7 @@
         <div class="columns large-8">
             <div class="callout">
                 <h3>@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])</h3>
-                @include('admin.userManagement.editForm', ['roles' => []])
+                @include('admin.userManagement.editForm')
             </div>
         </div>
     </div>
diff --git a/resources/views/admin/userManagement/edit.blade.php b/resources/views/admin/userManagement/edit.blade.php
index e1273fc3..42c273c3 100644
--- a/resources/views/admin/userManagement/edit.blade.php
+++ b/resources/views/admin/userManagement/edit.blade.php
@@ -1,22 +1,24 @@
 @extends('admin.layout')
 
-@section('pageName', @trans('admin/userManagement.editUser'))
+@section('pageName', @trans('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email]))
 
 @section('content')
 
-    <h1>@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])</h1>
+    <div class="row">
+        <h1>@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])</h1>
 
-    @if (session('success'))
-        <div class="callout success">
-            {{ session('success') }}
-        </div>
-    @endif
+        @if (session('success'))
+            <div class="callout success">
+                {{ session('success') }}
+            </div>
+        @endif
 
-    @if (session('error'))
-        <div class="callout alert">
-            {{ session('error') }}
-        </div>
-    @endif
+        @if (session('error'))
+            <div class="callout alert">
+                {{ session('error') }}
+            </div>
+        @endif
 
-    @include('admin.userManagement.editForm', ['roles' => $roles, 'user' => $user])
+        @include('admin.userManagement.editForm')
+    </div>
 @stop
\ No newline at end of file
diff --git a/resources/views/admin/userManagement/editForm.blade.php b/resources/views/admin/userManagement/editForm.blade.php
index e01c816a..10e6ce81 100644
--- a/resources/views/admin/userManagement/editForm.blade.php
+++ b/resources/views/admin/userManagement/editForm.blade.php
@@ -1,6 +1,8 @@
 <form method="POST" action="{{route('users.newPost')}}">
     {!! csrf_field() !!}
 
+    <input type="hidden" value="{{$user->id}}" name="userId" />
+
     <label>
         @lang('admin/userManagement.name')
         <input type="text" placeholder="@lang('admin/userManagement.name')" value="{{$user->name}}" name="name">
@@ -19,32 +21,28 @@
     </label>
 
     <label>
-        @lang('admin/userManagement.password')
+        @lang('admin/userManagement.password') <em>(@lang('admin/userManagement.passwordLeaveEmpty'))</em>
 
-        <input type="text" name="password">
+        <input type="text" name="password" value="">
+    </label>
 
-        @if (isset($errors) && $errors->has('password'))
+
+    @if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN)
+        <label>
+            @lang('admin/userManagement.roles')
+
+            <select name="role">
+                @foreach($roles as $role => $translation)
+                    <option value="{{$role}}" @if($role == $user->role) selected @endif>@lang($translation)</option>
+                @endforeach
+            </select>
+        </label>
+
+        @if (isset($errors) && $errors->has('role'))
             <div class="callout alert">
-                {{ $errors->first('password') }}
+                {{ $errors->first('role') }}
             </div>
         @endif
-    </label>
-
-
-    <label>
-        @lang('admin/userManagement.roles')
-
-        <select name="role">
-            @foreach($roles as $role => $translation)
-                <option value="{{$role}}" @if($role == $user->role) selected @endif>@lang($translation)</option>
-            @endforeach
-        </select>
-    </label>
-
-    @if (isset($errors) && $errors->has('role'))
-        <div class="callout alert">
-            {{ $errors->first('role') }}
-        </div>
     @endif
 
     <label>