diff --git a/legacy/elementary/data/themes/default.edc b/legacy/elementary/data/themes/default.edc
index 7d4da5afe2..ae8941cbee 100644
--- a/legacy/elementary/data/themes/default.edc
+++ b/legacy/elementary/data/themes/default.edc
@@ -3637,7 +3637,7 @@ collections {
 	    type: TEXTBLOCK;
 	    mouse_events: 1;
 	    scale: 1;
-	    entry_mode: PASSOWRD;
+	    entry_mode: PASSWORD;
 	    multiline: 0;
 	    source: "elm/entry/selection/default"; // selection under
 	    source4: "elm/entry/cursor/default"; // cursorover
diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index 89e46a140e..174cb1fe13 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -319,23 +319,20 @@ _text_to_mkup(const char *text)
 {
    char *str = NULL;
    int str_len = 0, str_alloc = 0;
-   int ch, pos = 0;
+   int ch, pos = 0, pos2 = 0;
    
    for (;;)
      {
         // FIXME: use evas_string_char_next_get()
-        ch = evas_common_font_utf8_get_next((unsigned char *)(text), &pos);
+        pos = pos2;
+        ch = evas_common_font_utf8_get_next((unsigned char *)(text), &pos2);
         if (ch <= 0) break;
         if (ch == '\n') str = _str_append(str, "<br>", &str_len, &str_alloc);
         else if (ch == '\t') str = _str_append(str, "<\t>", &str_len, &str_alloc);
         else
           {
-             int pos2;
              char tstr[16];
              
-             pos2 = pos;
-             // FIXME: use evas_string_char_next_get()
-             ch = evas_common_font_utf8_get_next((unsigned char *)(text), &pos2);
              strncpy(tstr, text + pos, pos2 - pos);
              tstr[pos2 - pos] = 0;
              str = _str_append(str, tstr, &str_len, &str_alloc);