some minor cleanup in change password GUI