Modify to cope with view after login
Work with login