Added check for user enabled/disabled on login