diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 4eee5f7ba1..afc00a4519 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -986,9 +986,10 @@ void gui_wps_format(struct wps_data *data, const char *bmpdir,
                     wps_tag_found = true;
                 }
                 if (*(buf+1) != 'x')
+#endif
                     buf++;
                 break;
-#endif
+
             case '\r': /* CR */
                 *buf = 0;
                 break;
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 05c33a0568..aeaaebd5c2 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -775,19 +775,19 @@ bool wps_data_load(struct wps_data *wps_data,
         if (! strcmp(buf, WPS_DEFAULTCFG) )
         {
             wps_reset(wps_data);
-	    global_settings.wps_file[0] = 0;
+            global_settings.wps_file[0] = 0;
             return false;
         } 
 
 #ifdef HAVE_REMOTE_LCD
-	if (! strcmp(buf, RWPS_DEFAULTCFG) )
-       	{
+        if (! strcmp(buf, RWPS_DEFAULTCFG) )
+        {
             wps_reset(wps_data);
-	    global_settings.rwps_file[0] = 0;
-	    return false;
-	}
+            global_settings.rwps_file[0] = 0;
+            return false;
+        }
 #endif
-	
+
         size_t bmpdirlen;
         char *bmpdir = strrchr(buf, '.');
         bmpdirlen = bmpdir - buf;