Fix login and base template