Added Check to see if user is activated