Here are the changes in the user module

I am still trying to figure out the tv and movie changes, I will forward them in a separate pull later.

These changes have been tested and are functional.