Removed username column and Modified login to correspond