User modal fixes