diff --git a/ttcn/LibIms_Templates.ttcn b/ttcn/LibIms_Templates.ttcn
index 9c18c8de6257d7145037691582dd61f7c334ee00..45cc5e4bb098a3bda1b61f8737cb83aeb410679e 100644
--- a/ttcn/LibIms_Templates.ttcn
+++ b/ttcn/LibIms_Templates.ttcn
@@ -84,7 +84,7 @@ module LibIms_Templates
         {
             displayName := *,
             addrSpec := {
-                scheme := "sip:",
+                scheme := c_sipScheme,
                 components := { sip:= {
                     userInfo := *,
                     hostPort := {p_host, p_port}}},
@@ -94,6 +94,20 @@ module LibIms_Templates
         }
 		
     template Addr_Union mw_UE1_Addr_display := {nameAddr:={displayName:=PX_IMS_SUT_UE1_DISPLAY,addrSpec:=?}};
+    
+    template Addr_Union mw_AddrUnion_userInfo(template (present) charstring p_userInfo) := 
+        {
+            nameAddr:={displayName := *,
+                addrSpec := {
+                    scheme := c_sipScheme,
+                    components := { sip:= {
+                        userInfo := {userOrTelephoneSubscriber :=p_userInfo, password :=*},
+                        hostPort := ?}},
+                    urlParameters := *,
+                    headers := *
+                }
+            }
+        }
 	
 group Subfields{
 
@@ -163,10 +177,7 @@ group HeaderFieldTemplates{
                     addrSpec := {
                         scheme := c_sipScheme,
                         components := { sip:= {
-                            userInfo := {
-                                userOrTelephoneSubscriber := "registrar",
-                                password := omit
-                            },
+                            userInfo := omit,
                             hostPort := {
                                 PX_IMS_TS_PCSCF_HOME_DOMAIN, PX_IMS_TS_PCSCF_PORT
                             }}},
@@ -279,7 +290,7 @@ group HeaderFieldTemplates{
     template PVisitedNetworkID m_pVisitedNetworkID_TS := 
     {
       fieldName := P_VISITED_NETWORK_E,
-      vNetWorkSpec := {{vNetworkSpecToken := "Visited ETSI 1",
+      vNetWorkSpec := {{vNetworkSpecToken := PX_IMS_SUT_ICSCF_VisitedNetworkID,
          genericParams := omit}}
     }
 	
@@ -461,8 +472,8 @@ group HeaderFieldTemplates{
         
         template SemicolonParam_List mw_challenge := superset(mw_ck,mw_ik);
      //   template SemicolonParam_List mw_challenge := {mw_ck,mw_ik};          
-		template GenericParam mw_ck := {"ck"};
-		template GenericParam mw_ik := {"ik"}
+		template GenericParam mw_ck := {"ck", *};
+		template GenericParam mw_ik := {"ik", *}
 		
 		
     /*