diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index ac933260b2e..3971a66b4d1 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -577,16 +577,18 @@ if ($action == 'edit')
 
 	// Url photo
 	print '<tr><td>URL photo</td><td><input type="text" name="photo" size="40" value="'.$adh->photo.'"></td></tr>';
-	foreach($adho->attribute_label as $key=>$value)
-	{
-		print "<tr><td>$value</td><td><input type=\"text\" name=\"options_$key\" size=\"40\" value=\"".$adh->array_options["options_$key"]."\"></td></tr>\n";
-	}
 
 	// Profil public
     print "<tr><td>".$langs->trans("Public")."</td><td>\n";
     $htmls->select_YesNo($adh->public,"public");
     print "</td></tr>\n";
 
+	// Attributs supplémentaires
+	foreach($adho->attribute_label as $key=>$value)
+	{
+		print "<tr><td>$value</td><td><input type=\"text\" name=\"options_$key\" size=\"40\" value=\"".$adh->array_options["options_$key"]."\"></td></tr>\n";
+	}
+
 	print '<tr><td colspan="3" align="center">';
 	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; &nbsp; ';
diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php
index 8a38dd1d1c0..6236bffd383 100644
--- a/htdocs/adherents/options.php
+++ b/htdocs/adherents/options.php
@@ -120,9 +120,12 @@ print "</table>";
  * Barre d'actions
  *
  */
-print '<div class="tabsAction">';
-print "<a class=\"tabAction\" href=\"options.php?action=create\">".$langs->trans("NewAttribute")."</a>";
-print "</div>";
+if ($_GET["action"] != 'create') 
+{
+	print '<div class="tabsAction">';
+	print "<a class=\"tabAction\" href=\"options.php?action=create\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
 
 
 /* ************************************************************************** */
@@ -131,33 +134,34 @@ print "</div>";
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($_GET["action"] == 'create') {
+if ($_GET["action"] == 'create')
+{
+	print "<br>";
+	
+	print_titre("Nouvel attribut");
 
-  print_titre("Nouvel attribut");
-  
-  print "<form action=\"options.php\" method=\"post\">";
-  print '<table class="border" width="100%">';
-  
-  print '<input type="hidden" name="action" value="add">';
+	print "<form action=\"options.php\" method=\"post\">";
+	print '<table class="border" width="100%">';
 
-  print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur"><input type="text" name="label" size="40"></td></tr>';  
-  print '<tr><td>'.$langs->trans("AttributeCode").' (pas d\'espace et uniquement des carateres alphanumeriques)</td><td class="valeur"><input type="text" name="attrname" size="40"></td></tr>';  
-  print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">';
-  $form->select_array('type',array('varchar'=>'chaine',
-				   'text'=>'texte',
-				   'int'=>'entier',
-				   'date'=>'date',
-				   'datetime'=>'date et heure'));
-  print '</td></tr>';
-  print '<tr><td>Taille</td><td><input type="text" name="size" size="5" value="255"></td></tr>';  
-  
-  print '<tr><td colspan="2" align="center"><input type="submit" name="button" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
-  print '<input type="submit" name="button" class="button" value="'.$langs->trans("Cancel").'"></td></tr>';
-  print "</form>\n";
-  print "</table>\n";
-  
-      
+	print '<input type="hidden" name="action" value="add">';
+
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur"><input type="text" name="label" size="40"></td></tr>';  
+	print '<tr><td>'.$langs->trans("AttributeCode").' (pas d\'espace et uniquement des carateres alphanumeriques)</td><td class="valeur"><input type="text" name="attrname" size="10"></td></tr>';
+	print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">';
+	$form->select_array('type',array('varchar'=>'chaine',
+	'text'=>'texte',
+	'int'=>'entier',
+	'date'=>'date',
+	'datetime'=>'date et heure'));
+	print '</td></tr>';
+	print '<tr><td>Taille</td><td><input type="text" name="size" size="5" value="255"></td></tr>';  
+
+	print '<tr><td colspan="2" align="center"><input type="submit" name="button" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
+	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Cancel").'"></td></tr>';
+	print "</form>\n";
+	print "</table>\n";
 } 
+
 /* ************************************************************************** */
 /*                                                                            */
 /* Edition d'un champ optionnel                                               */