Refactor User DB dependancy - Fix #2