Can only set password once
Merge branch 'jimmy'