Changing username to email, improve disable message.