Fixed some issues in order process, make some testing.

Added pairing with the email address etc... Everything fine and complete.