SIGN IN SIGN UP

Replace mm_extra_addons as well

Also a bit of cleanup
X
xen committed
3535ac6456f132316f9bcfcc6d536e01953f7b83
Parent: 2b0d4eb