diff --git a/fabfile/conf.py b/fabfile/conf.py
index add8176fe8..c9d28b4770 100644
--- a/fabfile/conf.py
+++ b/fabfile/conf.py
@@ -1,4 +1,6 @@
 import os
+import string
+import random
 
 from fabric.api import env
 
@@ -6,13 +8,15 @@ from literals import (DEFAULT_INSTALL_PATH, DEFAULT_VIRTUALENV_NAME,
     DEFAULT_REPOSITORY_NAME, DEFAULT_OS, OS_CHOICES, 
     DEFAULT_DATABASE_MANAGER, DB_CHOICES, DEFAULT_DATABASE_NAME,
     DEFAULT_WEBSERVER, WEB_CHOICES, DEFAULT_DATABASE_USERNAME,
-    DJANGO_DB_DRIVERS, DEFAULT_DATABASE_HOST)
+    DJANGO_DB_DRIVERS, DEFAULT_DATABASE_HOST, DEFAULT_PASSWORD_LENGTH)
 
 
 def password_generator():
-    return 'password'
-
+    # http://snipplr.com/view/63223/python-password-generator/
+    chars = string.ascii_letters + string.digits
+    return ''.join(random.choice(chars) for x in range(DEFAULT_PASSWORD_LENGTH))
 
+        
 def setup_environment():
     env['os'] = getattr(env, 'os', DEFAULT_OS)
     env['os_name'] = OS_CHOICES[env.os]
diff --git a/fabfile/literals.py b/fabfile/literals.py
index cc33060091..aad7b3dfae 100644
--- a/fabfile/literals.py
+++ b/fabfile/literals.py
@@ -59,3 +59,4 @@ DEFAULT_DATABASE_NAME = 'mayan'
 DEFAULT_WEBSERVER = WEB_APACHE
 DEFAULT_DATABASE_USERNAME = 'mayan'
 DEFAULT_DATABASE_HOST = '127.0.0.1'
+DEFAULT_PASSWORD_LENGTH = 10