Registration fix, user activation
Merge