diff --git a/tools_bin/ngcp-provisioning-template b/tools_bin/ngcp-provisioning-template
index c3cbf0c4a7..b41d04f8e1 100644
--- a/tools_bin/ngcp-provisioning-template
+++ b/tools_bin/ngcp-provisioning-template
@@ -23,8 +23,8 @@ my @panel_configs = qw(
    /etc/ngcp_panel.conf
    /ngcp_panel.conf
 );
-#   /home/rkrenn/sipwise/git/vagrant-ngcp/ngcp_panel.conf
-#   /usr/local/devel/vagrant-ngcp/ngcp_panel.conf
+#  /home/rkrenn/sipwise/git/vagrant-ngcp/ngcp_panel.conf
+#  /usr/local/devel/vagrant-ngcp/ngcp_panel.conf
 my @provisioning_configs = qw(
    /etc/ngcp-panel/provisioning.conf
 );
@@ -41,8 +41,10 @@ my $template_name = shift @ARGV;
 #my $template_name = 'My First Provisioning Template'; #'vaa_test';
 #my $template_name = 'vaa_test_js';
 pod2usage(2) unless $template_name;
+pod2usage(1) if $template_name =~ /help|\?/;
 my $help;
 my $log_level;
+Getopt::Long::Configure("pass_through");
 GetOptions(
     ( map { ('db_' . $_ . ':s') => \$db{$_}; } keys %db ),
     'log_level:s' => \$log_level,
@@ -62,6 +64,7 @@ if (exists $templates->{$template_name}) {
     my $csv_file;
     #my $csv_file = '/home/rkrenn/temp/provisioning_templates/CCS_ICM_Nummern.csv';
     my $purge;
+    Getopt::Long::Configure("no_pass_through");
     GetOptions(
         ( map { ($_ . ($fields->{$_}->{required} ? '=' : ':') . 's') => \$values->{$_}; } keys %$values ),
         "purge" => \$purge,