diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index fd810fec..d4078520 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -1763,11 +1763,15 @@
 #endif
 
 /**
- * PPP_MD5_RANDM==1: Use MD5 for better randomness. Automatically enabled if CHAP or EAP support is enabled.
+ * PPP_MD5_RANDM==1: Use MD5 for better randomness. Automatically enabled if CHAP support is enabled.
  */
 #ifndef PPP_MD5_RANDM
 #define PPP_MD5_RANDM                     0
 #endif
+#if CHAP_SUPPORT
+#undef PPP_MD5_RANDM
+#define PPP_MD5_RANDM                     1   /*  MD5 Random is required for CHAP */
+#endif /* CHAP_SUPPORT */
 
 /**
  * PolarSSL library, used if necessary and not previously disabled
@@ -1804,9 +1808,7 @@
 
 #if CHAP_SUPPORT || EAP_SUPPORT || PPP_MD5_RANDM
 #ifndef LWIP_INCLUDED_POLARSSL_MD5
-#define LWIP_INCLUDED_POLARSSL_MD5	1	/* CHAP and EAP require MD5 support */
-#undef PPP_MD5_RANDM
-#define PPP_MD5_RANDM			1	/*  MD5 Random is required for CHAP and EAP */
+#define LWIP_INCLUDED_POLARSSL_MD5	1	/* CHAP, EAP and MD5 Random require MD5 support */
 #endif /* LWIP_INCLUDED_POLARSSL_MD5 */
 #endif /* CHAP_SUPPORT || EAP_SUPPORT || PPP_MD5_RANDM */