diff --git a/app/config/version.php b/app/config/version.php
index 740b0b2f46..d0fe34fa10 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v2.0-pre',
-  'hash_version' => 'v2.0-pre-beta-393-g2036402',
+  'hash_version' => 'v2.0-pre-beta2-1-gc1642e3',
 );
\ No newline at end of file
diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php
index 35a88ee035..340f6f0265 100755
--- a/app/views/backend/users/edit.blade.php
+++ b/app/views/backend/users/edit.blade.php
@@ -87,15 +87,22 @@
 			<div class="form-group {{ $errors->has('password') ? 'has-error' : '' }}">
 				<label class="col-md-3 control-label" for="password">@lang('admin/users/table.password')
 				@if (!$user->id)
-				<i class='fa fa-asterisk'></i>
+					<i class='fa fa-asterisk'></i>
 				@endif
 				</label>
 				<div class="col-md-5">
-				<input type="password" name="password" class="form-control" id="password" value="" {{ ((Config::get('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}>
-					{{ $errors->first('password', '<br><span class="alert-msg">:message</span>') }}
+					<input type="password" name="password" class="form-control" id="password" value="" {{ ((Config::get('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}>
+					<span id="generated-password"></span>
+						{{ $errors->first('password', '<br><span class="alert-msg">:message</span>') }}
 				</div>
+				<div class="col-md-4">
+					 <a href="#" class="left" id="genPassword" style="float: left;">Generate</a>
+				</div>
+
+
 			</div>
 
+
 			<!-- Password Confirm -->
 			<div class="form-group {{ $errors->has('password_confirm') ? 'has-error' : '' }}">
 				<label class="col-md-3 control-label" for="password_confirm">@lang('admin/users/table.password_confirm')
@@ -340,4 +347,25 @@ $(document).ready(function() {
 });
 </script>
 
+<script src="{{ asset('assets/js/pGenerator.jquery.js') }}"></script>
+
+<script>
+$(document).ready(function(){
+
+    $('#genPassword').pGenerator({
+        'bind': 'click',
+        'passwordElement': '#password',
+        'displayElement': '#generated-password',
+        'passwordLength': 16,
+        'uppercase': true,
+        'lowercase': true,
+        'numbers':   true,
+        'specialChars': true,
+        'onPasswordGenerated': function(generatedPassword) {
+			 $('#password_confirm').val($('#password').val());
+        }
+    });
+});
+</script>
+
 @stop
diff --git a/public/assets/js/pGenerator.jquery.js b/public/assets/js/pGenerator.jquery.js
new file mode 100755
index 0000000000..466cf22d1d
--- /dev/null
+++ b/public/assets/js/pGenerator.jquery.js
@@ -0,0 +1,146 @@
+/*!
+ * pGenerator jQuery Plugin v1.0.0
+ * http://accountspassword.com/password-generator-jquery-plugin
+ *
+ * Created by AccountsPassword.com
+ * Released under the GPL General Public License (Feel free to copy, modify or redistribute this plugin.)
+ *
+ */
+
+(function($){
+  	var numbers_array = new Array(),
+		upper_letters_array = new Array(),
+		lower_letters_array = new Array(),
+		special_chars_array = new Array(),
+		$pGeneratorElement = null;
+	var methods = {
+		init : function( options, callbacks) {
+
+			var settings = $.extend({
+				'bind': 'click',
+				'passwordElement': null,
+				'displayElement': null,
+				'passwordLength': 16,
+				'uppercase': true,
+				'lowercase': true,
+				'numbers':   true,
+				'specialChars': true,
+				'onPasswordGenerated': function(generatedPassword) { }
+			}, options);
+
+			for(var i = 48; i < 58; i++)
+				numbers_array.push(i);
+			for(i = 65; i < 91; i++)
+				upper_letters_array.push(i);
+			for(i = 97; i < 123; i++)
+				lower_letters_array.push(i);
+			special_chars_array = [33,35,64,36,38,42,91,93,123,125,92,47,63,58,59,95,45,53];
+
+			return this.each(function(){
+
+				$pGeneratorElement = $(this);
+
+				$pGeneratorElement.bind(settings.bind, function(e){
+					e.preventDefault();
+					methods.generatePassword(settings);
+				});
+
+			});
+		},
+		generatePassword: function(settings) {
+
+			var password = new Array(),
+				selOptions = settings.uppercase + settings.lowercase + settings.numbers + settings.specialChars,
+				selected = 0,
+				no_lower_letters = new Array();
+
+			var optionLength = Math.floor(settings.passwordLength / selOptions);
+
+			if(settings.uppercase) {
+				// uppercase letters
+				for(var i = 0; i < optionLength; i++) {
+					password.push(String.fromCharCode(upper_letters_array[randomFromInterval(0, upper_letters_array.length - 1)]));
+				}
+
+				no_lower_letters = no_lower_letters.concat(upper_letters_array);
+
+				selected++;
+			}
+
+			if(settings.numbers) {
+				// numbers letters
+				for(var i = 0; i < optionLength; i++) {
+					password.push(String.fromCharCode(numbers_array[randomFromInterval(0, numbers_array.length - 1)]));
+				}
+
+				no_lower_letters = no_lower_letters.concat(numbers_array);
+
+				selected++;
+			}
+
+			if(settings.specialChars) {
+				// numbers letters
+				for(var i = 0; i < optionLength; i++) {
+					password.push(String.fromCharCode(special_chars_array[randomFromInterval(0, special_chars_array.length - 1)]));
+				}
+
+				no_lower_letters = no_lower_letters.concat(special_chars_array);
+
+				selected++;
+			}
+
+			var remained = settings.passwordLength - (selected * optionLength);
+
+			if(settings.lowercase) {
+
+				for(var i = 0; i < remained; i++) {
+					password.push(String.fromCharCode(lower_letters_array[randomFromInterval(0, lower_letters_array.length - 1)]));
+				}
+
+			} else {
+
+				for(var i = 0; i < remained; i++) {
+					password.push(String.fromCharCode(no_lower_letters[randomFromInterval(0, no_lower_letters.length - 1)]));
+				}
+			}
+			password = shuffle(password);
+			passwordString = password.join('');
+
+			if(settings.passwordElement !== null) {
+				$(settings.passwordElement).val(passwordString);
+			}
+
+			if(settings.displayElement !== null) {
+                if($(settings.displayElement).is("input")) {
+                    $(settings.displayElement).val(passwordString);
+                } else {
+                    $(settings.displayElement).text(passwordString);
+                }
+			}
+
+			settings.onPasswordGenerated(passwordString);
+
+		}
+  	};
+
+	function shuffle(o){ //v1.0
+		for(var j, x, i = o.length; i; j = parseInt(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
+		return o;
+	};
+
+	function randomFromInterval(from, to)
+	{
+		return Math.floor(Math.random()*(to-from+1)+from);
+	};
+
+	$.fn.pGenerator = function(method) {
+    	if ( methods[method] ) {
+      		return methods[method].apply( this, Array.prototype.slice.call( arguments, 1 ));
+    	} else if ( typeof method === 'object' || ! method ) {
+      		return methods.init.apply( this, arguments );
+    	} else {
+      		$.error( 'Method ' +  method + ' does not exist on jQuery.pGenerator' );
+    	}
+  	};
+
+})(jQuery);