Need to fix flash msg and login