Remove duplicate code + other fix

I'm not sure if dayz_DisplayGenderSelect is supposed to be in this, but
I didn't remove the waitUntil since it can be added by a server admin I
suppose.

Anyway, this should fix most RPT spam on 108074...
Merge pull request #1045 from icomrade/master

Remove duplicate code + other fix