Attempt to fix User circular dependency auto-loading

When User is loaded first, try to emulate the behavior as if Principal was loaded first.

Conflicts:
	app/models/user.rb