Patching User modal in, cleaning up