Differentiated setPassword and register
Merge branch 'master' into jimmy
Merge branch 'jimmy'