Progress towards admin changing server password
Merge branch 'US69' into dev