Horrible fix until a better solution is found
Merged a better solution for User