Fixing bugs in includes and asserts of the login