small bugfix :)
Merge branch 'next'
fixed password-bug