Added changes for login system(unimplemented)