Fix all relevant user signin/signon issues