Fixing Password generation