Make 'message' the default type on serverside
Remove space above the signup-cta and fix the confirmation cta logic