a better solution for confirmation code
no comments
Merge branch 'Gioyik-confirmation-code' into dev