Improved player spawn, closes #1890