Username or EmailPassword
I mostly like your suggestions with one big exception:
* Patents will no longer be assumed to be valid by courts.
WTF?! That's plain stupid. If you pay big bucks to file a patent application or whatever and it's granted after long examination, of course it should be assumed valid by courts.