diff --git a/src/org/camunda/latera/bss/connectors/hid/hydra/Customer.groovy b/src/org/camunda/latera/bss/connectors/hid/hydra/Customer.groovy
index db9f44e0..e4eefb1f 100644
--- a/src/org/camunda/latera/bss/connectors/hid/hydra/Customer.groovy
+++ b/src/org/camunda/latera/bss/connectors/hid/hydra/Customer.groovy
@@ -421,13 +421,13 @@ trait Customer {
         vch_VC_LOGIN            : params.login
       ])
       if (access) {
-        Boolean passwordIsSet = changeNetServicePassword(subjServId: access?.num_N_SUBJ_SERV_ID, newPassword: params.password)
+        Boolean passwordIsSet = changeNetServicePassword(subjServId: access.num_N_SUBJ_SERV_ID, newPassword: params.password)
         if (!passwordIsSet) {
           throw new Exception('Error while setting application password!')
         }
       }
       logger.info("   Customer now have access to net service!")
-      return access
+      return access + [vch_VC_PASS: params.password]
     } catch (Exception e){
       logger.error("   Error while providing access to net service!")
       logger.error_oracle(e)
@@ -525,13 +525,13 @@ trait Customer {
         vch_VC_LOGIN            : params.login
       ])
       if (access) {
-        Boolean passwordIsSet = changeAppPassword(subjServId: access?.num_N_SUBJ_SERV_ID, newPassword: params.password)
+        Boolean passwordIsSet = changeAppPassword(subjServId: access.num_N_SUBJ_SERV_ID, newPassword: params.password)
         if (!passwordIsSet) {
           throw new Exception('Error while setting application password!')
         }
       }
       logger.info("   Customer now have access to application!")
-      return access
+      return access + [vch_VC_PASS: params.password]
     } catch (Exception e){
       logger.error("   Error while providing access to application!")
       logger.error_oracle(e)