CONN-1362

User will no longer be switched to the user he creates