CDB-3892 Logging in as an enterprise user isn't straightforward

https://cartodb.atlassian.net/browse/CDB-3892