FIIW added

Fiiw users added
Check for existing user improved