Refactor Auth service and Login forms