Fixed login and makeup