fixed email
added change password & cleanup