BRA-8: Fixed user dropdown