Feature/signup support #5586