Improved Activation & Forgot Password system