Edit Personal Info working again, moved change password to a different form