auth popups refactored