Fix issues with SignUpConfirmation which would occur on cassandra