Subhas | Cleaned up the entire login and user handling logic