diff --git a/lib/NGCP/Panel/Controller/Contract.pm b/lib/NGCP/Panel/Controller/Contract.pm
index 5e7509cb16..8ac1f9c482 100644
--- a/lib/NGCP/Panel/Controller/Contract.pm
+++ b/lib/NGCP/Panel/Controller/Contract.pm
@@ -136,7 +136,11 @@ sub edit :Chained('base') :PathPart('edit') :Args(0) {
             'contact.create' => ( $is_peering_reseller
                 ? $c->uri_for('/contact/create/noreseller')
                 : $c->uri_for('/contact/create')),
-                   'billing_profile.create'  => $c->uri_for('/billing/create')},
+                   'billing_profile.create'  => $c->uri_for('/billing/create'),
+                   'subscriber_email_template.create'  => $c->uri_for('/emailtemplate/create'),
+                   'passreset_email_template.create'  => $c->uri_for('/emailtemplate/create'),
+                   'invoice_email_template.create'  => $c->uri_for('/emailtemplate/create'),
+        },
         back_uri => $c->req->uri,
     );
     if($posted && $form->validated) {
@@ -401,7 +405,10 @@ sub reseller_create :Chained('reseller_list') :PathPart('create') :Args(0) {
         c => $c,
         form => $form,
         fields => {'contact.create' => $c->uri_for('/contact/create/noreseller'),
-                   'billing_profile.create'  => $c->uri_for('/billing/create/noreseller')
+                   'billing_profile.create'  => $c->uri_for('/billing/create/noreseller'),
+                   'subscriber_email_template.create'  => $c->uri_for('/emailtemplate/create'),
+                   'passreset_email_template.create'  => $c->uri_for('/emailtemplate/create'),
+                   'invoice_email_template.create'  => $c->uri_for('/emailtemplate/create'),
         },
         back_uri => $c->req->uri,
     );
diff --git a/lib/NGCP/Panel/Controller/Customer.pm b/lib/NGCP/Panel/Controller/Customer.pm
index 56c960e35a..aaf00d53e9 100644
--- a/lib/NGCP/Panel/Controller/Customer.pm
+++ b/lib/NGCP/Panel/Controller/Customer.pm
@@ -135,18 +135,10 @@ sub create :Chained('list_customer') :PathPart('create') :Args(0) {
         try {
             my $schema = $c->model('DB');
             $schema->txn_do(sub {
-                #foreach(qw/contact subscriber_email_template passreset_email_template invoice_email_template/){
-                #    $form->params->{$_.'_id'} = $form->params->{$_}{id} || undef;
-                #    delete $form->params->{$_};
-                #}
-                $form->params->{contact_id} = $form->params->{contact}{id};
-                delete $form->params->{contact};
-                $form->params->{subscriber_email_template_id} = $form->params->{subscriber_email_template}{id} || undef;
-                delete $form->params->{subscriber_email_template};
-                $form->params->{passreset_email_template_id} = $form->params->{passreset_email_template}{id} || undef;
-                delete $form->params->{passreset_email_template};
-                $form->params->{invoice_email_template_id} = $form->params->{invoice_email_template}{id} || undef;
-                delete $form->params->{invoice_email_template};
+                foreach(qw/contact subscriber_email_template passreset_email_template invoice_email_template/){
+                    $form->params->{$_.'_id'} = $form->params->{$_}{id} || undef;
+                    delete $form->params->{$_};
+                }
                 my $bprof_id = $form->params->{billing_profile}{id};
                 delete $form->params->{billing_profile};
                 $form->{create_timestamp} = $form->{modify_timestamp} = NGCP::Panel::Utils::DateTime::current_local;