Fixed validation and added more user datafields