diff --git a/api/gateway/chain/internal/server/internal/serverimp.go b/api/gateway/chain/internal/server/internal/serverimp.go
index b4f7c31..cb25047 100644
--- a/api/gateway/chain/internal/server/internal/serverimp.go
+++ b/api/gateway/chain/internal/server/internal/serverimp.go
@@ -115,7 +115,7 @@ func (i *Imp) Start() error {
 		return gatewayservice.NewService(logger, repo, producer, opts...), nil
 	}
 
-	app, err := grpcapp.NewApp(i.logger, "chain_gateway", cfg.Config, i.debug, repoFactory, serviceFactory)
+	app, err := grpcapp.NewApp(i.logger, "chain", cfg.Config, i.debug, repoFactory, serviceFactory)
 	if err != nil {
 		return err
 	}
diff --git a/api/gateway/chain/main.go b/api/gateway/chain/main.go
index cea9801..f9dc6f4 100644
--- a/api/gateway/chain/main.go
+++ b/api/gateway/chain/main.go
@@ -13,5 +13,5 @@ func factory(logger mlogger.Logger, file string, debug bool) (server.Application
 }
 
 func main() {
-	smain.RunServer("main", appversion.Create(), factory)
+	smain.RunServer("gateway", appversion.Create(), factory)
 }
diff --git a/api/gateway/mntx/internal/server/internal/serverimp.go b/api/gateway/mntx/internal/server/internal/serverimp.go
index b85a478..1a8820a 100644
--- a/api/gateway/mntx/internal/server/internal/serverimp.go
+++ b/api/gateway/mntx/internal/server/internal/serverimp.go
@@ -125,7 +125,7 @@ func (i *Imp) Start() error {
 		return svc, nil
 	}
 
-	app, err := grpcapp.NewApp(i.logger, "mntx_gateway", cfg.Config, i.debug, nil, serviceFactory)
+	app, err := grpcapp.NewApp(i.logger, "monetix", cfg.Config, i.debug, nil, serviceFactory)
 	if err != nil {
 		return err
 	}
diff --git a/api/gateway/mntx/main.go b/api/gateway/mntx/main.go
index 4c9b143..3ce8ea1 100644
--- a/api/gateway/mntx/main.go
+++ b/api/gateway/mntx/main.go
@@ -13,5 +13,5 @@ func factory(logger mlogger.Logger, file string, debug bool) (server.Application
 }
 
 func main() {
-	smain.RunServer("mntx_gateway", appversion.Create(), factory)
+	smain.RunServer("gateway", appversion.Create(), factory)
 }
diff --git a/frontend/pweb/lib/pages/address_book/form/page.dart b/frontend/pweb/lib/pages/address_book/form/page.dart
index 74c523f..1db5c03 100644
--- a/frontend/pweb/lib/pages/address_book/form/page.dart
+++ b/frontend/pweb/lib/pages/address_book/form/page.dart
@@ -96,8 +96,8 @@ class _AdressBookRecipientFormState extends State<AdressBookRecipientForm> {
         name: getPaymentTypeLabel(context, data.type),
         data: data,
       );
-      return recipient;
     }
+    return recipient;
   }
 
   //TODO: Change when registration is ready