--- loncom/interface/loncreateuser.pm	2014/01/22 18:01:43	1.387
+++ loncom/interface/loncreateuser.pm	2014/02/05 18:02:16	1.388
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.387 2014/01/22 18:01:43 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.388 2014/02/05 18:02:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1273,6 +1273,7 @@ ENDTITLE
         my $personal_table = 
             &personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                    $inst_results{$ccuname.':'.$ccdomain});
+        # (Do not offer Disable Safeguard here)
         $r->print($personal_table);
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -1381,13 +1382,10 @@ ENDCHANGEUSER
         }
         $r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"</h2>'.
                   "\n".'<div class="LC_left_float">');
-        my ($personal_table,$showforceid) = 
+        my $personal_table = 
             &personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                    $inst_results{$ccuname.':'.$ccdomain});
         $r->print($personal_table);
-        if ($showforceid) {
-            $r->print('<table>'.&Apache::lonuserutils::forceid_change($context).'</table>');
-        }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
@@ -2170,7 +2168,7 @@ sub modify_login_block {
 
 sub personal_data_display {
     my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
-    my ($output,$showforceid,%userenv,%canmodify,%canmodify_status);
+    my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
     my $rowcount = 0;
@@ -2257,8 +2255,8 @@ sub personal_data_display {
             } else {
                 $row .= $userenv{$item};
             }
-            if ($item eq 'id') {
-                $showforceid = $canmodify{$item};
+            if (($item eq 'id') && ($canmodify{$item})) {
+                 $row .= '<br />'.&Apache::lonuserutils::forceid_change($context);
             }
         }
         $row .= &Apache::lonhtmlcommon::row_closure(1);
@@ -2309,7 +2307,7 @@ sub personal_data_display {
         if ($context eq 'selfcreate') {
             return($output,$rowcount,$editable);
         } else {
-            return ($output,$showforceid);
+            return $output;
         }
     } else {
         return $output;