Error messages for demo accounts + minor modifications