diff --git a/telegram-base.c b/telegram-base.c
index a3d7db8..72a00f0 100644
--- a/telegram-base.c
+++ b/telegram-base.c
@@ -451,12 +451,16 @@ static void code_auth_receive_result (struct tgl_state *TLS, void *extra, int su
 }
 
 void request_code_entered (gpointer data, const gchar *code) {
+  char *stripped = g_strstrip (purple_markup_strip_html (code));
+
   struct tgl_state *TLS = data;
   connection_data *conn = TLS->ev_base;
   char const *username = purple_account_get_username(conn->pa);
+  debug ("sending code: '%s'\n", stripped);
   tgl_do_send_code_result (TLS, username, (int)strlen (username), conn->hash,
-                           (int)strlen (conn->hash), code, (int)strlen (code),
+                           (int)strlen (conn->hash), stripped, (int)strlen (stripped),
                            code_receive_result, 0);
+  g_free (stripped);
 }
 
 static void request_code_canceled (gpointer data) {
@@ -492,18 +496,20 @@ static void request_name_code_entered (PurpleConnection* gc, PurpleRequestFields
   struct tgl_state *TLS = conn->TLS;
   char const *username = purple_account_get_username(conn->pa);
   
-  const char* first = purple_request_fields_get_string(fields, "first_name");
-  const char* last = purple_request_fields_get_string(fields, "last_name");
-  const char* code = purple_request_fields_get_string(fields, "code");
+  char* first = g_strstrip (g_strdup (purple_request_fields_get_string (fields, "first_name")));
+  char* last = g_strstrip (g_strdup (purple_request_fields_get_string (fields, "last_name")));
+  char* code = g_strstrip (g_strdup (purple_request_fields_get_string (fields, "code")));
   if (!first || !last || !code) {
     request_name_and_code (TLS);
     return;
   }
-  
-  tgl_do_send_code_result_auth(TLS, username, (int)strlen(username), conn->hash,
+  tgl_do_send_code_result_auth (TLS, username, (int)strlen(username), conn->hash,
                                (int)strlen (conn->hash), code, (int)strlen (code), first,
                                (int)strlen (first), last, (int)strlen (last),
                                code_auth_receive_result, NULL);
+  g_free (first);
+  g_free (last);
+  g_free (code);
 }
 
 static void request_name_and_code (struct tgl_state *TLS) {
diff --git a/telegram-purple.c b/telegram-purple.c
index 8d7167e..c7360b5 100755
--- a/telegram-purple.c
+++ b/telegram-purple.c
@@ -491,6 +491,12 @@ static int tgprpl_send_im (PurpleConnection * gc, const char *who, const char *m
   // this is part of a workaround to support clients without
   // the request API (request.h), see telegram-base.c:request_code()
   if (conn->in_fallback_chat) {
+
+    // OTR plugins may try to insert messages that don't contain the code
+    if (tgp_startswith (message, "?OTR")) {
+        info ("Fallback SMS auth, skipping OTR messsage: '%s'", message);
+        return -1;
+    }
     request_code_entered (conn->TLS, message);
     conn->in_fallback_chat = 0;
     return 1;
@@ -780,7 +786,9 @@ static void tgprpl_init (PurplePlugin *plugin) {
                                           TGP_KEY_PASSWORD_TWO_FACTOR, NULL);
   prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, opt);
   
-  opt = purple_account_option_bool_new("Fallback SMS Verification", "compat-verification", 0);
+  opt = purple_account_option_bool_new(
+          "Fallback SMS verification\n(Helps when not using Pidgin and you aren't being prompted for the code)", 
+          "compat-verification", 0);
   prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, opt);
  
 
diff --git a/tgp-utils.c b/tgp-utils.c
index 4daa89f..2a7fe10 100644
--- a/tgp-utils.c
+++ b/tgp-utils.c
@@ -142,3 +142,18 @@ const char *tgp_mime_to_filetype (const char *mime) {
   }
   return NULL;
 }
+
+int tgp_startswith (const char *str, const char *with) {
+  if (! str || !with) {
+    return FALSE;
+  }
+  int slen = strlen (str), wlen = strlen (with);
+  if (wlen > slen) {
+    return FALSE;
+  }
+  while (*with) if (*str++ != *with++) {
+    return FALSE;
+  }
+  return TRUE;
+}
+
diff --git a/tgp-utils.h b/tgp-utils.h
index c27f0d4..bdaccdc 100644
--- a/tgp-utils.h
+++ b/tgp-utils.h
@@ -50,5 +50,6 @@ char *tgp_g_format_size (gint64 size);
 void tgp_g_queue_free_full (GQueue *queue, GDestroyNotify free_func);
 void tgp_g_list_free_full (GList *list, GDestroyNotify free_func);
 const char *tgp_mime_to_filetype (const char *mime);
+int tgp_startswith (const char *str, const char *with);
 
 #endif