diff --git a/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php b/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
index f33d3d9..e76c161 100644
--- a/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
+++ b/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
@@ -52,7 +52,7 @@ public function executeRegister($request)
 
     opActivateBehavior::disable();
     $authMode = $memberConfig->getMember()->getConfig('register_auth_mode');
-    $pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre');
+    $addressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre');
     opActivateBehavior::enable();
 
     if ('MobileUID' === $authMode)
@@ -61,9 +61,8 @@ public function executeRegister($request)
     }
     $this->forward404Unless($authMode === $this->getUser()->getCurrentAuthMode());
 
-    if (!$pcAddressPre)
-    {
-      
+    if (!$addressPre)
+    {      
       return sfView::ERROR;
     }
 
diff --git a/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php b/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
index 48c15dd..268062a 100644
--- a/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
+++ b/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
@@ -15,7 +15,7 @@ public function executeRegisterBox($request)
     $token = $request->getParameter('token');
     $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token);
     opActivateBehavior::disable();
-    $this->pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre');
+    $this->addressPre = $memberConfig->getMember()->getConfig('pc_address_pre') ? $memberConfig->getMember()->getConfig('pc_address_pre') : $memberConfig->getMember()->getConfig('mobile_address_pre');
     opActivateBehavior::enable();
   }
 }
diff --git a/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php b/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
index 957e84c..f29c60f 100644
--- a/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
+++ b/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
@@ -1,4 +1,4 @@
-<?php if (!$pcAddressPre): ?>
+<?php if (!$addressPre): ?>
 <?php
 $options = array(
   'title' => __('Errors'),
diff --git a/lib/form/opAuthRegisterFormMailAddress.class.php b/lib/form/opAuthRegisterFormMailAddress.class.php
index 53241bd..821bd85 100644
--- a/lib/form/opAuthRegisterFormMailAddress.class.php
+++ b/lib/form/opAuthRegisterFormMailAddress.class.php
@@ -24,7 +24,6 @@ public function configure()
     // Hack for non-rendering secret answer
     $this->configForm->getWidget('secret_answer')->setOption('type', 'text');
     
-    $this->mergePostValidator(new sfValidatorCallback(array('callback' => array($this, 'validateMemberConfig'))));
   }
 
   public function bindAll($request)
@@ -55,7 +54,15 @@ public function doSave()
     else
     {
       $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId());
-      $memberConfig->setName('pc_address');
+      if (!$memberConfig)
+      {
+        $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId());
+        $memberConfig->setName('mobile_address');
+      }
+      else
+      {
+        $memberConfig->setName('pc_address');
+      }
     }
 
     $memberConfig->save();
diff --git a/templates/mail/mobile/_notifyRegisterURL.php b/templates/mail/mobile/_notifyRegisterURL.php
index eb1394f..6416432 100644
--- a/templates/mail/mobile/_notifyRegisterURL.php
+++ b/templates/mail/mobile/_notifyRegisterURL.php
@@ -5,12 +5,4 @@
 
 <?php echo __('* Participate in %1%', array('%1%' => $snsName)) ?>
 
-<?php if ($isMobile) : ?>
-<?php echo app_url_for('mobile_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
-
-<?php echo __('Can access this registration URL with mobile only.') ?>
-<?php else: ?>
-<?php echo app_url_for('pc_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
-
-<?php echo __('Can access this registration URL with pc only.') ?>
-<?php endif; ?>
+<?php echo url_for(sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true); ?>