Further code cleanups in progress
Fix change password header bug