Merge "Fix bug blocking access to secondary users."