diff --git a/src/include/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h
index 3d73c365..f93747fb 100644
--- a/src/include/netif/ppp/ppp.h
+++ b/src/include/netif/ppp/ppp.h
@@ -266,9 +266,9 @@ typedef struct ppp_settings_s {
 #endif /* PAP_SUPPPORT */
 
 #if CHAP_SUPPORT
+#if PPP_SERVER
   u8_t  chap_timeout_time;       /* Timeout (seconds) for retransmitting req */
   u8_t  chap_max_transmits;      /* max # times to send challenge */
-#if PPP_SERVER
   u8_t  chap_rechallenge_time;   /* Time to wait for auth-req from peer */
 #endif /* PPP_SERVER */
 #endif /* CHAP_SUPPPORT */
diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index 6c070483..1cd5958e 100644
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -674,9 +674,9 @@ ppp_pcb *ppp_new(struct netif *pppif, const struct link_callbacks *callbacks, vo
 #endif /* PAP_SUPPORT */
 
 #if CHAP_SUPPORT
+#if PPP_SERVER
   pcb->settings.chap_timeout_time = CHAP_DEFTIMEOUT;
   pcb->settings.chap_max_transmits = CHAP_DEFTRANSMITS;
-#if PPP_SERVER
   pcb->settings.chap_rechallenge_time = CHAP_DEFRECHALLENGETIME;
 #endif /* PPP_SERVER */
 #endif /* CHAP_SUPPPORT */