Tidied up client accept/deny step