Minor: Style fixes.
Handles db connection on popup and sso: true.
release: 5.3.0