diff --git a/ide/Espressif/ESP-IDF/examples/wolfssh_template/components/wolfssl/include/user_settings.h b/ide/Espressif/ESP-IDF/examples/wolfssh_template/components/wolfssl/include/user_settings.h
index 798b48c4c..41f588a01 100644
--- a/ide/Espressif/ESP-IDF/examples/wolfssh_template/components/wolfssl/include/user_settings.h
+++ b/ide/Espressif/ESP-IDF/examples/wolfssh_template/components/wolfssl/include/user_settings.h
@@ -41,8 +41,7 @@
 */
 
 /* Optionally enable some wolfSSH settings */
-#define ESP_ENABLE_WOLFSSH
-#ifdef  ESP_ENABLE_WOLFSSH
+#ifdef ESP_ENABLE_WOLFSSH
     /* The default SSH Windows size is massive for an embedded target. Limit it: */
     #define DEFAULT_WINDOW_SZ 2000
 
diff --git a/ide/Espressif/ESP-IDF/examples/wolfssl_echoserver/CMakeLists.txt b/ide/Espressif/ESP-IDF/examples/wolfssl_echoserver/CMakeLists.txt
index 2aa67b499..2b754ab8f 100644
--- a/ide/Espressif/ESP-IDF/examples/wolfssl_echoserver/CMakeLists.txt
+++ b/ide/Espressif/ESP-IDF/examples/wolfssl_echoserver/CMakeLists.txt
@@ -33,9 +33,8 @@ cmake_minimum_required(VERSION 3.16)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSL_USER_SETTINGS")
 set(WOLFSSL_USER_SETTINGS ON)
 
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWOLFSSH_TERM")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDEBUG_WOLFSSH")
+# Assume we have a ESP_ENABLE_WOLFSSH section in user_settings.h
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DESP_ENABLE_WOLFSSH")
 
 # The wolfSSL CMake file should be able to find the source code.
 # Otherwise, assign an environment variable or set it here:
diff --git a/ide/Espressif/ESP-IDF/examples/wolfssl_echoserver/components/wolfssl/include/user_settings.h b/ide/Espressif/ESP-IDF/examples/wolfssl_echoserver/components/wolfssl/include/user_settings.h
index 2976abff2..41f588a01 100644
--- a/ide/Espressif/ESP-IDF/examples/wolfssl_echoserver/components/wolfssl/include/user_settings.h
+++ b/ide/Espressif/ESP-IDF/examples/wolfssl_echoserver/components/wolfssl/include/user_settings.h
@@ -41,8 +41,7 @@
 */
 
 /* Optionally enable some wolfSSH settings */
-#define ESP_ENABLE_WOLFSSH
-#ifdef  ESP_ENABLE_WOLFSSH
+#ifdef ESP_ENABLE_WOLFSSH
     /* The default SSH Windows size is massive for an embedded target. Limit it: */
     #define DEFAULT_WINDOW_SZ 2000
 
@@ -146,13 +145,13 @@
 
         /* DH disabled by default, needed if ECDSA/ECC also turned off */
         #define HAVE_DH
-    #else
-        #define WOLFSSH_NO_RSA
+    #else
+        #define WOLFSSH_NO_RSA
     #endif
 #else
     #error "Either RSA or ECC must be enabled"
 #endif
-
+
 
 /* when you want to use pkcs7 */
 /* #define HAVE_PKCS7 */