Fixed #3 and removed message from login page