diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 402457cfd..463ff5249 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,9 @@
 ### IMPORTANT IMPORTANT IMPORTANT
 
 1. Chose what you want to report between the sections "New Feature / Enhacement" and "Issue / Question / Bug".
-2. Remove just the one of the two sections you don't need.
-3. Fill in all the details as requested.
+2. Remove just the one of the two sections you don't need 
+3. Remove this section as it's just a guideline
+4. Fill in all the details as requested by the section you chose
 
 If you remove the complete template when submitting a Bug your issue will be closed as we cannot help without basic information.
 
@@ -16,13 +17,13 @@ Please bear in mind that we will implement new features only on the current code
 
 ### Issue / Question / Bug
 
-Before submitting an issue please make sure you tick (add a x between the square brakets with no spaces) and agree with all the following check boxes:
+Before submitting an issue please make sure you tick (add a x between the square brakets with no spaces) the following check boxes:
 
+- [] I'm reporting an issue of an unmodified OSPOS installation
 - [] I checked open and closed issues database and no similar issue was already discussed (please make sure you searched!)
 - [] I read the README, WHATS_NEW and UPGRADE
-- [] I read the FAQ (https://github.com/jekkos/opensourcepos#faq) for any known install and/or upgrade gotchas (in specific PHP has php5-gd, php-intl and sockets installed)
+- [] I read the FAQ (https://github.com/jekkos/opensourcepos#faq) for any known install and/or upgrade gotchas (in specific PHP has php-gd, php-intl, sockets and etc. installed)
 - [] I read the wiki
-- [] I'm reporting an issue of an unmodified OSPOS installation
 - [] I ran any database upgrade scripts (e.g. database/2.4_to_3.0.sql), and migrating function
 - [] I'm aware the latest master could be a development version and therefore not stable
 - [] I know the version of OSPOS and git commit hash (check the footer of your OSPOS), the name and version of OS, Web server, PHP and MySQL and will add them to my issue report
@@ -31,11 +32,11 @@ Before submitting an issue please make sure you tick (add a x between the square
 
 - OSPOS version is:
 - OSPOS git commit hash is: 
-- PHP version is: [] 5.5, [] 5.6, [] 7.x
-- MySQL version is: [] 5.5, [] 5.6, [] 5.7
-- OS and version is:
-- WebServer is: [] Apache 2.2, [] Apache 2.4, [] Nginx
-- Any spacific installation package for the LAMP stack I used: 
+- PHP version is:   (e.g. 5.5, 5.6, 7.0, 7.1)
+- MySQL or MariaDB version is:   (e.g. MySQL 5.5, MySQL 5.6, MySQL 5.7, MariaDB 10.0, MariaDB 10.1, MariaDB 10.2)
+- OS and version is:   (e.g. CentOS 6.9, Ubuntu 16.4, Windows 10)
+- WebServer is:   (e.g. Apache 2.2, Apache 2.4, Nginx 1.12, Nginx 1.13)
+- (If applicable) Installation package for the LAMP/LEMP stack is:   (e.g. WAMP, XAMPP)
 
 ### Expected behaviour