Keep the old format (ie combined) when logging in production. **Development**  **Production** 