diff --git a/README.md b/README.md
index a5e309f9e..527af8594 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## Sonoff-Tasmota
 Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE.
 
-Current version is **3.9.7** - See ```sonoff/_releasenotes.ino``` for change information.
+Current version is **3.9.8** - See ```sonoff/_releasenotes.ino``` for change information.
 
 - This version provides all (Sonoff) modules in one file and starts up with Sonoff Basic.
 - Once uploaded select module using the configuration webpage or the commands ```Modules``` and ```Module```.
@@ -11,7 +11,7 @@ Current version is **3.9.7** - See ```sonoff/_releasenotes.ino``` for change inf
 See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki) for more information.<br />
 See [Community](https://groups.google.com/d/forum/sonoffusers) for forum and more user experience.
 
-Starting with version 2.0.0 the following devices are supported:
+The following devices are supported:
 - [iTead Sonoff Basic](http://sonoff.itead.cc/en/products/sonoff/sonoff-basic)
 - [iTead Sonoff RF](http://sonoff.itead.cc/en/products/sonoff/sonoff-rf)
 - [iTead Sonoff SV](https://www.itead.cc/sonoff-sv.html)
diff --git a/api/arduino/sonoff.ino.bin b/api/arduino/sonoff.ino.bin
index b4306d1dc..693ee4225 100644
Binary files a/api/arduino/sonoff.ino.bin and b/api/arduino/sonoff.ino.bin differ
diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index d0ee99334..2f4ac83cc 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -1,4 +1,7 @@
-/* 3.9.7 20170129
+/* 3.9.8 20170130
+ * Remove GPIO07 and GPIO08 from user selectable (#5)
+ *
+ * 3.9.7 20170129
  * Fix possible WS2812 exceptions when using emulation
  * Add command Emulation to dynamic configure Belkin WeMo and Hue Bridge for Alexa
  *
diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index 4dfa6853a..0120f2a5b 100644
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -10,7 +10,7 @@
  * ====================================================
 */
 
-#define VERSION                0x03090700   // 3.9.7
+#define VERSION                0x03090800   // 3.9.8
 
 enum log_t   {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE, LOG_LEVEL_ALL};
 enum week_t  {Last, First, Second, Third, Fourth};
diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h
index 315f26b3f..88617dba3 100644
--- a/sonoff/sonoff_template.h
+++ b/sonoff/sonoff_template.h
@@ -152,9 +152,7 @@ const mytmplt modules[MAXMODULE] PROGMEM = {
      0,
      GPIO_REL3,        // GPIO04 Sonoff 4CH Red Led and Relay 3 (0 = Off, 1 = On)
      GPIO_REL2,        // GPIO05 Sonoff 4CH Red Led and Relay 2 (0 = Off, 1 = On)
-     0,
-     GPIO_USER,        // GPIO07 Optional sensor
-     GPIO_USER,        // GPIO08 Optional sensor
+     0, 0, 0,
      GPIO_KEY2,        // GPIO09 Button 2
      GPIO_KEY3,        // GPIO10 Button 3
      0,
@@ -235,7 +233,8 @@ const mytmplt modules[MAXMODULE] PROGMEM = {
   },
   { "User Test",       // Sonoff Basic User Test
      GPIO_KEY1,        // GPIO00 Button
-     0, 0,
+     0,
+     GPIO_USER,        // GPIO02 Optional sensor
      GPIO_USER,        // GPIO03 Serial TXD and Optional sensor
      GPIO_USER,        // GPIO04 Optional sensor
      0, 0, 0, 0, 0, 0, 0,