Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php	(revision 20541)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php	(revision 20690)
@@ -356,11 +356,6 @@
      */
     function sfCustomerRegisterParam (&$objFormParam, $isAdmin = false) {
-        if($isAdmin) {
-            $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK"));
-            $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        }else{
-            $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK"));
-            $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        }
+        $objFormParam->addParam("パスワード", 'password', STEXT_LEN, 'a', array("EXIST_CHECK", "SPTAB_CHECK", "ALNUM_CHECK", "MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("パスワード確認用の質問の答え", "reminder_answer", STEXT_LEN, 'aKV', array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $objFormParam->addParam("パスワード確認用の質問", 'reminder', STEXT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
         $objFormParam->addParam("性別", 'sex', INT_LEN, 'n', array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
@@ -429,13 +424,11 @@
         $objErr = SC_Helper_Customer_Ex::sfCustomerRegisterErrorCheck($objErr, $isAdmin);
 
-        if ((isset($objErr->arrErr['password'])
-                && $objFormParam->getValue('password') == DEFAULT_PASSWORD)
-              or $isAdmin) {
+        if (isset($objErr->arrErr['password'])
+             && $objFormParam->getValue('password') == DEFAULT_PASSWORD) {
             unset($objErr->arrErr['password']);
             unset($objErr->arrErr['password02']);
         }
-        if ((isset($objErr->arrErr['reminder_answer'])
-                && $objFormParam->getValue('reminder_answer') == DEFAULT_PASSWORD)
-              or $isAdmin) {
+        if (isset($objErr->arrErr['reminder_answer'])
+                && $objFormParam->getValue('reminder_answer') == DEFAULT_PASSWORD) {
             unset($objErr->arrErr['reminder_answer']);
         }
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 20532)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 20690)
@@ -114,5 +114,5 @@
             <tr>
                 <th>パスワード<span class="attention"> *</span></th>
-                <td><!--{$arrForm.password|h}--></td>
+                <td><!--{$smarty.const.DEFAULT_PASSWORD}--></td>
             </tr>
             <tr>
@@ -120,5 +120,5 @@
                 <td>
                     質問： <!--{$arrReminder[$arrForm.reminder]|h}--><br />
-                    答え： <!--{$arrForm.reminder_answer|h}-->
+                    答え： <!--{$smarty.const.DEFAULT_PASSWORD}-->
                 </td>
             </tr>