CSV user import

Changes required to allow for CSV user import