diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admincli/admin.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
index 9dadda5..366a6da 100755
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
@@ -76,24 +76,21 @@ def usage():
 	out.append('')
 	out.append('general options:')
 	out.append('  --%-30s %s' % ('logfile', 'path and name of the logfile to be used'))
-	out.append('')
-	out.append('create options:')
 	out.append('  --%-30s %s' % ('binddn', 'bind DN'))
 	out.append('  --%-30s %s' % ('bindpwd', 'bind password'))
 	out.append('  --%-30s %s' % ('bindpwdfile', 'file containing bind password'))
+	out.append('  --%-30s %s' % ('tls', '0 (no); 1 (try); 2 (must)'))
+	out.append('')
+	out.append('create options:')
 	out.append('  --%-30s %s' % ('position', 'Set position in tree'))
 	out.append('  --%-30s %s' % ('set', 'Set variable to value, e.g. foo=bar'))
 	out.append('  --%-30s %s' % ('superordinate', 'Use superordinate module'))
 	out.append('  --%-30s %s' % ('option', 'Use only given module options'))
 	out.append('  --%-30s %s' % ('customattribute', 'Set custom attribute foo=bar'))
 	out.append('  --%-30s %s' % ('policy-reference', 'Reference to policy given by DN'))
-	out.append('  --%-30s %s' % ('tls', '0 (no); 1 (try); 2 (must)'))
 	out.append('  --%-30s   ' % ('ignore_exists'))
 	out.append('')
 	out.append('modify options:')
-	out.append('  --%-30s %s' % ('binddn', 'bind DN'))
-	out.append('  --%-30s %s' % ('bindpwd', 'bind password'))
-	out.append('  --%-30s %s' % ('bindpwdfile', 'file containing bind password'))
 	out.append('  --%-30s %s' % ('dn', 'Edit object with DN'))
 	out.append('  --%-30s %s' % ('arg', 'Edit object with ARG'))
 	out.append('  --%-30s %s' % ('set', 'Set variable to value, e.g. foo=bar'))
@@ -105,17 +102,12 @@ def usage():
 	out.append('  --%-30s %s' % ('customattribute-remove', 'Remove custom attribute'))
 	out.append('  --%-30s %s' % ('policy-reference', 'Reference to policy given by DN'))
 	out.append('  --%-30s %s' % ('policy-dereference', 'Remove reference to policy given by DN'))
-	out.append('  --%-30s %s' % ('tls', '0 (no); 1 (try); 2 (must)'))
 	out.append('')
 	out.append('remove options:')
-	out.append('  --%-30s %s' % ('binddn', 'bind DN'))
-	out.append('  --%-30s %s' % ('bindpwd', 'bind password'))
-	out.append('  --%-30s %s' % ('bindpwdfile', 'file containing bind password'))
 	out.append('  --%-30s %s' % ('dn', 'Remove object with DN'))
 	out.append('  --%-30s %s' % ('superordinate', 'Use superordinate module'))
 	out.append('  --%-30s %s' % ('arg', 'Remove object with ARG'))
 	out.append('  --%-30s %s' % ('filter', 'Lookup filter e.g. foo=bar'))
-	out.append('  --%-30s %s' % ('tls', '0 (no); 1 (try); 2 (must)'))
 	out.append('  --%-30s %s' % ('remove_referring', 'remove referring objects'))
 	out.append('')
 	out.append('list options:')
@@ -124,9 +116,6 @@ def usage():
 	out.append('    %-30s %s' % ('', '0:short, 1:long (with policy-DN)'))
 	out.append('')
 	out.append('move options:')
-	out.append('  --%-30s %s' % ('binddn', 'bind DN'))
-	out.append('  --%-30s %s' % ('bindpwd', 'bind password'))
-	out.append('  --%-30s %s' % ('bindpwdfile', 'file containing bind password'))
 	out.append('  --%-30s %s' % ('dn', 'Move object with DN'))
 	out.append('  --%-30s %s' % ('position', 'Move to position in tree'))
 	out.append('')