Made changes for inactive account and email verification