Fixed users form conflicts