Changed user set-up to match new implementation by Aisa