Fixes/user and client activation token#8

yasserfedsi merged 2 commits into

masterkhwaris/backend:masterfrom

fixes/user-and-client-activation-tokenkhwaris/backend:fixes/user-and-client-activation-tokenCopy head branch name to clipboard