Fixed messages and popup server-side logic