Feature/fixing old users invitation

Code to closes #484