Fix on user edit form - still not perfect