diff --git a/features/lorawan/LoRaWANStack.h b/features/lorawan/LoRaWANStack.h
index 986176644b..20d229c727 100644
--- a/features/lorawan/LoRaWANStack.h
+++ b/features/lorawan/LoRaWANStack.h
@@ -1,27 +1,41 @@
 /**
- / _____)             _              | |
-( (____  _____ ____ _| |_ _____  ____| |__
- \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- _____) ) ____| | | || |_| ____( (___| | | |
-(______/|_____)_|_|_| \__)_____)\____)_| |_|
-    (C)2013 Semtech
- ___ _____ _   ___ _  _____ ___  ___  ___ ___
-/ __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
-\__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
-|___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
-embedded.connectivity.solutions===============
-
-Description: LoRaWAN stack layer that controls both MAC and PHY underneath
-
-License: Revised BSD License, see LICENSE.TXT file include in the project
-
-Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
-
-
-Copyright (c) 2017, Arm Limited and affiliates.
-
-SPDX-License-Identifier: BSD-3-Clause
-*/
+ * \file      LoRaWANStack.h
+ *
+ * \brief     LoRaWAN stack layer implementation
+ *
+ * \copyright Revised BSD License, see LICENSE.TXT file include in the project
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ *
+ * \author    Gregory Cristian ( Semtech )
+ *
+ * \author    Daniel Jaeckle ( STACKFORCE )
+ *
+ * \defgroup  LoRaWAN stack layer that controls MAC layer underneath
+ *
+ * License: Revised BSD License, see LICENSE.TXT file include in the project
+ *
+ * Copyright (c) 2017, Arm Limited and affiliates.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #ifndef LORAWANSTACK_H_
 #define LORAWANSTACK_H_
diff --git a/features/lorawan/lorastack/mac/LoRaMac.cpp b/features/lorawan/lorastack/mac/LoRaMac.cpp
index b1764b2ce3..38a039e32c 100644
--- a/features/lorawan/lorastack/mac/LoRaMac.cpp
+++ b/features/lorawan/lorastack/mac/LoRaMac.cpp
@@ -1421,12 +1421,12 @@ lorawan_status_t LoRaMac::prepare_join(const lorawan_connect_t *params, bool is_
 {
     if (params) {
         if (is_otaa) {
-//            if ((params->connection_u.otaa.dev_eui == NULL) ||
-//                (params->connection_u.otaa.app_eui == NULL) ||
-//                (params->connection_u.otaa.app_key == NULL) ||
-//                (params->connection_u.otaa.nb_trials == 0)) {
-//                return LORAWAN_STATUS_PARAMETER_INVALID;
-//            }
+            if ((params->connection_u.otaa.dev_eui == NULL) ||
+                (params->connection_u.otaa.app_eui == NULL) ||
+                (params->connection_u.otaa.app_key == NULL) ||
+                (params->connection_u.otaa.nb_trials == 0)) {
+                return LORAWAN_STATUS_PARAMETER_INVALID;
+            }
             _params.keys.dev_eui = params->connection_u.otaa.dev_eui;
             _params.keys.app_eui = params->connection_u.otaa.app_eui;
             _params.keys.app_key = params->connection_u.otaa.app_key;