Login page merge fix