diff --git a/bacnet-stack/demo/handler/h_rd.c b/bacnet-stack/demo/handler/h_rd.c
index de7501ac..9b13eea5 100644
--- a/bacnet-stack/demo/handler/h_rd.c
+++ b/bacnet-stack/demo/handler/h_rd.c
@@ -38,6 +38,7 @@
 #include "reject.h"
 #include "rd.h"
 
+static char *Password = "Jesus";
 static BACNET_CHARACTER_STRING My_Password;
 
 void handler_reinitialize_device(uint8_t * service_request,
@@ -45,7 +46,7 @@ void handler_reinitialize_device(uint8_t * service_request,
     BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data)
 {
     BACNET_REINITIALIZED_STATE state;
-    BACNET_CHARACTER_STRING password;
+    BACNET_CHARACTER_STRING their_password;
     int len = 0;
     int pdu_len = 0;
     BACNET_ADDRESS my_address;
@@ -53,13 +54,15 @@ void handler_reinitialize_device(uint8_t * service_request,
 
     /* decode the service request only */
     len = rd_decode_service_request(service_request,
-        service_len, &state, &password);
+        service_len, &state, &their_password);
+    #if PRINT_ENABLED
     fprintf(stderr, "ReinitializeDevice!\n");
     if (len > 0)
         fprintf(stderr, "ReinitializeDevice: state=%u password=%s\n",
-            (unsigned) state, characterstring_value(&password));
+            (unsigned) state, characterstring_value(&their_password));
     else
         fprintf(stderr, "ReinitializeDevice: Unable to decode request!\n");
+    #endif
     /* prepare a reply */
     datalink_get_my_address(&my_address);
     /* encode the NPDU portion of the packet */
@@ -69,26 +72,34 @@ void handler_reinitialize_device(uint8_t * service_request,
     if (len == -1) {
         pdu_len += abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
             service_data->invoke_id, ABORT_REASON_OTHER);
+        #if PRINT_ENABLED
         fprintf(stderr,
             "ReinitializeDevice: Sending Abort - could not decode.\n");
+        #endif         
     } else if (service_data->segmented_message) {
         pdu_len += abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
             service_data->invoke_id,
             ABORT_REASON_SEGMENTATION_NOT_SUPPORTED);
+        #if PRINT_ENABLED
         fprintf(stderr,
             "ReinitializeDevice: Sending Abort - segmented message.\n");
+        #endif
     } else if (state >= MAX_BACNET_REINITIALIZED_STATE) {
         pdu_len += reject_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
             service_data->invoke_id, REJECT_REASON_UNDEFINED_ENUMERATION);
+        #if PRINT_ENABLED
         fprintf(stderr,
             "ReinitializeDevice: Sending Reject - undefined enumeration\n");
+        #endif
     } else {
-        characterstring_init_ansi(&My_Password, "Jesus");
-        if (characterstring_same(&password, &My_Password)) {
+        characterstring_init_ansi(&My_Password, Password);
+        if (characterstring_same(&their_password, &My_Password)) {
             pdu_len += encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
                 service_data->invoke_id,
                 SERVICE_CONFIRMED_REINITIALIZE_DEVICE);
+            #if PRINT_ENABLED
             fprintf(stderr, "ReinitializeDevice: Sending Simple Ack!\n");
+            #endif
             /* FIXME: now you can reboot, restart, quit, or something clever */
             /* Note: you can use a mix of state and password to do specific stuff */
             /* Note: if you don't do something clever like actually restart,
@@ -99,15 +110,19 @@ void handler_reinitialize_device(uint8_t * service_request,
                 service_data->invoke_id,
                 SERVICE_CONFIRMED_REINITIALIZE_DEVICE,
                 ERROR_CLASS_SERVICES, ERROR_CODE_PASSWORD_FAILURE);
+            #if PRINT_ENABLED
             fprintf(stderr,
                 "ReinitializeDevice: Sending Error - password failure.\n");
+            #endif
         }
     }
     bytes_sent = datalink_send_pdu(src, /* destination address */
         &Handler_Transmit_Buffer[0], pdu_len);  /* number of bytes of data */
+    #if PRINT_ENABLED
     if (bytes_sent <= 0)
         fprintf(stderr, "ReinitializeDevice: Failed to send PDU (%s)!\n",
             strerror(errno));
+    #endif
 
     return;
 }