Fix #1394 & Fix #1393 Import users trough CSV is broken