diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/002-Attributes.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/002-Attributes.yaml
index 73e6832..56375d9 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/002-Attributes.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/000-EntityDefinitions/002-Attributes.yaml
@@ -101,4 +101,5 @@
   - IDA_DateAndTime: '{ea71cc92-a5e9-49c1-b487-8ad178b557d2}'
 
   - IDA_DecimalPositions: '{ec916b5c-ae0e-48c7-bf84-7604a9db99ed}'
-  - IDA_WholeNumber: '{3840999a-8a06-4b6a-a234-d24108dbc42f}'
\ No newline at end of file
+  - IDA_WholeNumber: '{3840999a-8a06-4b6a-a234-d24108dbc42f}'
+  - IDA_ReferralURL: '{6daaa721-db70-43ad-b373-6a8038e69d2e}'
\ No newline at end of file
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/003-Classes/00004-TextAttribute.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/003-Classes/00004-TextAttribute.yaml
index ba20671..df151ca 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/003-Classes/00004-TextAttribute.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.Core/003-Classes/00004-TextAttribute.yaml
@@ -129,6 +129,10 @@
     name: 'Verify New Password'
     index: 91
 
+  - textAttribute: '&IDA_ReferralURL;'
+    name: 'Referral URL'
+    index: 105
+
   - textAttribute: '&IDA_TargetURL;'
     name: 'Destination URL'
     index: 108
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/002-Attributes.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/002-Attributes.yaml
index aad378b..bc70a16 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/002-Attributes.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/002-Attributes.yaml
@@ -103,4 +103,5 @@
   - IDA_DateAndTime: '{ea71cc92-a5e9-49c1-b487-8ad178b557d2}'
 
   - IDA_DecimalPositions: '{ec916b5c-ae0e-48c7-bf84-7604a9db99ed}'
-  - IDA_WholeNumber: '{3840999a-8a06-4b6a-a234-d24108dbc42f}'
\ No newline at end of file
+  - IDA_WholeNumber: '{3840999a-8a06-4b6a-a234-d24108dbc42f}'
+  - IDA_ReferralURL: '{6daaa721-db70-43ad-b373-6a8038e69d2e}'
\ No newline at end of file
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00004-TextAttribute.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00004-TextAttribute.yaml
index 233a4db..2a18b67 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00004-TextAttribute.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00004-TextAttribute.yaml
@@ -128,6 +128,10 @@
     name: 'Verify New Password'
     index: 91
 
+  - textAttribute: '&IDA_ReferralURL;'
+    name: 'Referral URL'
+    index: 105
+
   - textAttribute: '&IDA_TargetURL;'
     name: 'Destination URL'
     index: 108
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00062-BuildUIResponseMethod.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00062-BuildUIResponseMethod.yaml
index 2d633c8..79247e6 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00062-BuildUIResponseMethod.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00062-BuildUIResponseMethod.yaml
@@ -3,6 +3,9 @@
   - IDR_Build_UI_Response_Method__uses__Executable_returning_Element: '{6f066ec6-b978-4627-81da-78fee1bed5e5}'
   - IDR_Executable_returning_Element__used_by__Build_UI_Response_Method: '{0e662556-ca79-43fe-9a50-57ad22df65de}'
 
+  - IDR_Build_UI_Response_Method__gets_target_url_from__Executable_returning_Attribute: '{6c09db3b-6fc9-4bf6-ab16-a49bc7d4101b}'
+  - IDR_Executable_returning_Attribute__target_for__Build_UI_Response_Method: '{0c7a2f36-1cd7-4100-bc5a-6b11ebba9627}'
+
 - library: '&IDL_MochaBaseSystem;'
   instances:
   - class:     '&IDC_BuildUIResponseMethod;'
@@ -32,6 +35,8 @@
       customTagName: 'moduleId'
     - instance: '&IDR_Build_UI_Response_Method__uses__Executable_returning_Element;'
       customTagName: 'usesExecutableReturningElement'
+    - instance: '&IDR_Build_UI_Response_Method__gets_target_url_from__Executable_returning_Attribute;'
+      customTagName: 'targetUrlAttributeId'
 
   - relationship: '&IDR_Build_UI_Response_Method__uses__Executable_returning_Element;'
     index: 89
@@ -48,3 +53,19 @@
     destinationClassId: '&IDC_BuildUIResponseMethod;'
     siblingRelationshipId: '&IDR_Build_UI_Response_Method__uses__Executable_returning_Element;'
     singular: no
+
+  - relationship: '&IDR_Build_UI_Response_Method__gets_target_url_from__Executable_returning_Attribute;'
+    index: 229
+    sourceClassId: '&IDC_BuildUIResponseMethod;'
+    type: 'gets target url from'
+    destinationClassId: '&IDC_ExecutableReturningAttribute;'
+    siblingRelationshipId: '&IDR_Executable_returning_Attribute__target_for__Build_UI_Response_Method;'
+    singular: yes
+
+  - relationship: '&IDR_Executable_returning_Attribute__target_for__Build_UI_Response_Method;'
+    index: 230
+    sourceClassId: '&IDC_ExecutableReturningAttribute;'
+    type: 'target for'
+    destinationClassId: '&IDC_BuildUIResponseMethod;'
+    siblingRelationshipId: '&IDR_Build_UI_Response_Method__gets_target_url_from__Executable_returning_Attribute;'
+    singular: no
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml
index e4786fb..fbf7a26 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml
@@ -17,7 +17,8 @@
   instances:
   - buildUIResponseMethod: '&IDM_LoginPageResponse;'
     # usesExecutableReturningElement: '&IDE_BuildAttributeMethod_View;'
-    targetUrl: '~/d/home.htmld'
+    # targetUrl: '~/d/home.htmld'
+    targetUrlAttributeId: '&IDA_ReferralURL;'
     # FIXME!: this should trigger a write user session, then redirect to home page
 
   - buildUIResponseMethod: '&IDM_LoginPageResponseUnauthorized;'