Moving code around.  Added change password for user