Setting password to be username if none is defined
Fixing reassignment of variables
Fixing incorrect password variable on rights
Merge branch 'master' into 1.1.x