Fixed a merge conflict in user modals causing a crash.