Fix potential issue when creating users
Fix crash in signup