settle sign up issue
Merge branch 'nixwork3'