Better fix for #74, fixes #74.
Also undoes my half assed fix in GUI code, this one is actually done server side as it should have been.