change email and username improved