diff --git a/src/WorkflowActivityLibrary.UI/FormController/ActivityTextBox.cs b/src/WorkflowActivityLibrary.UI/FormController/ActivityTextBox.cs
index 5554614..ef81a94 100644
--- a/src/WorkflowActivityLibrary.UI/FormController/ActivityTextBox.cs
+++ b/src/WorkflowActivityLibrary.UI/FormController/ActivityTextBox.cs
@@ -74,7 +74,7 @@ namespace MicrosoftServices.IdentityManagement.WorkflowActivityLibrary.UI.FormCo
 
             set
             {
-                this.textBoxControl.Text = value;
+                this.textBoxControl.Text = !string.IsNullOrEmpty(value) ? value.Trim() : value;
             }
         }
         
diff --git a/src/WorkflowActivityLibrary/Definitions/Definition.cs b/src/WorkflowActivityLibrary/Definitions/Definition.cs
index a8f7d54..fc56cb1 100644
--- a/src/WorkflowActivityLibrary/Definitions/Definition.cs
+++ b/src/WorkflowActivityLibrary/Definitions/Definition.cs
@@ -30,8 +30,8 @@ namespace MicrosoftServices.IdentityManagement.WorkflowActivityLibrary.Definitio
         /// <param name="check">if set to true, the right-hand side can be assigned null value.</param>
         public Definition(string left, string right, bool check)
         {
-            this.Left = left;
-            this.Right = right;
+            this.Left = !string.IsNullOrEmpty(left) ? left.Trim() : left;
+            this.Right = !string.IsNullOrEmpty(right) ? right.Trim() : right;
             this.Check = check;
         }