diff --git a/server/conf/RDSFactor.ini b/server/conf/RDSFactor.ini
index 7f64461..f825d79 100644
--- a/server/conf/RDSFactor.ini
+++ b/server/conf/RDSFactor.ini
@@ -2,7 +2,7 @@
 ADField=telephoneNumber
 ADMailfield=mail
 Debug=1
-EnableOTP=0
+EnableOTP=1
 EnableSMS=1
 LDAPDomain=ad.example.com
 MailServer=
diff --git a/server/handlers/RDSHandler.vb b/server/handlers/RDSHandler.vb
index 0ec5d9a..971e854 100644
--- a/server/handlers/RDSHandler.vb
+++ b/server/handlers/RDSHandler.vb
@@ -13,8 +13,6 @@ Public Class RDSHandler
     Private Shared encryptedChallangeResults As New Hashtable
     Private Shared userLaunchTimestamps As New Hashtable
 
-    
-
     Private mPacket As RADIUSPacket
     Private mUsername As String
     Private mPassword As String
@@ -65,7 +63,6 @@ Public Class RDSHandler
         Else
             ProcessAccessRequest()
         End If
-
     End Sub
 
     ' Process the RDS specific App Launch request.
@@ -111,7 +108,6 @@ Public Class RDSHandler
             sessionTimestamps.Remove(mUsername)
             mPacket.RejectAccessRequest()
         End If
-
     End Sub
 
     Public Shared Function HasValidLaunchWindow(username) As Boolean
@@ -145,9 +141,6 @@ Public Class RDSHandler
     ' * valid app launch window
     '
     ' The launch window is closed after this request.
-    '
-    ' TODO: Fix race-condition RD Web vs. Gateway. Don't start RDP client in RD Web 
-    ' before ensuring App Launch request was successful 
     Public Sub ProcessGatewayRequest()
         RDSFactor.AccessLog(mPacket, "Gateway Request")
 
diff --git a/web/RDWeb/Pages/en-US/tokenform.aspx b/web/RDWeb/Pages/en-US/tokenform.aspx
index 686e6e4..50af74c 100644
Binary files a/web/RDWeb/Pages/en-US/tokenform.aspx and b/web/RDWeb/Pages/en-US/tokenform.aspx differ
diff --git a/web/RDWeb/Pages/en-US/tokenform.aspx.cs b/web/RDWeb/Pages/en-US/tokenform.aspx.cs
index e43c5d8..ae973ea 100644
--- a/web/RDWeb/Pages/en-US/tokenform.aspx.cs
+++ b/web/RDWeb/Pages/en-US/tokenform.aspx.cs
@@ -17,6 +17,7 @@ public partial class SMSToken : System.Web.UI.Page
     //
     // Localizable Text
     //
+    public const string L_CompanyName_Text = "Work Resources";
     public const string L_SmsToken_Text = "Enter SMS Token:";
     public const string L_LogonFailureLabel_Text = "The user name or password that you entered is not valid. Try typing it again.";
     public const string L_SubmitLabel_Text = "Submit";