Major checkpoint
fixed issues in the system user addition