diff --git a/apps/activedirectory/local/mode/dcdiag.pm b/apps/activedirectory/local/mode/dcdiag.pm
index 5cd950747..fabece521 100644
--- a/apps/activedirectory/local/mode/dcdiag.pm
+++ b/apps/activedirectory/local/mode/dcdiag.pm
@@ -37,17 +37,18 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 { 
-                                  "config:s"         => { name => 'config', },
-                                  "language:s"       => { name => 'language', default => 'en' },
-                                  "dfsr"             => { name => 'dfsr', },
-                                  "noeventlog"       => { name => 'noeventlog', },
-                                  "timeout:s"         => { name => 'timeout', default => 30 },
+                                  "config:s"            => { name => 'config' },
+                                  "language:s"          => { name => 'language', default => 'en' },
+                                  "dfsr"                => { name => 'dfsr' },
+                                  "noeventlog"          => { name => 'noeventlog' },
+                                  "nomachineaccount"    => { name => 'nomachineaccount' },
+                                  "timeout:s"           => { name => 'timeout', default => 30 },
                                 });
     $self->{os_is2003} = 0;
     $self->{os_is2008} = 0;
     $self->{os_is2012} = 0;
     
-    $self->{msg} = {global => undef, ok => undef, warning => undef, critical => undef};
+    $self->{msg} = { global => undef, ok => undef, warning => undef, critical => undef };
     return $self;
 }
 
@@ -132,7 +133,8 @@ sub load_xml {
 sub dcdiag {
     my ($self, %options) = @_;
 
-    my $dcdiag_cmd = 'dcdiag /test:services /test:replications /test:advertising /test:fsmocheck /test:ridmanager /test:machineaccount';
+    my $dcdiag_cmd = 'dcdiag /test:services /test:replications /test:advertising /test:fsmocheck /test:ridmanager';
+    $dcdiag_cmd .= ' /test:machineaccount' if (!defined($self->{option_results}->{machineaccount}));
     $dcdiag_cmd .= ' /test:frssysvol' if ($self->{os_is2003} == 1);
     $dcdiag_cmd .= ' /test:sysvolcheck' if ($self->{os_is2008} == 1 || $self->{os_is2012} == 1);
     
@@ -214,10 +216,14 @@ Specifies that SysVol replication uses DFS instead of FRS (Windows 2008 or later
 
 Don't run the dc tests kccevent, frsevent and dfsrevent
 
+=item B<--nomachineaccount>
+
+Don't run the dc tests machineaccount
+
 =item B<--timeout>
 
 Set timeout time for command execution (Default: 30 sec)
 
 =back
 
-=cut
\ No newline at end of file
+=cut