diff --git a/addhost.php b/addhost.php
index d33fc00e08..67b859d2e8 100755
--- a/addhost.php
+++ b/addhost.php
@@ -92,7 +92,7 @@ if (!empty($argv[1]))
         {
           $transport = $arg;
         }
-        elseif (preg_match ('/^(sha1|md5)$/i', $arg))
+        elseif (preg_match ('/^(sha|md5)$/i', $arg))
         {
           $v3['authalgo'] = $arg;
         }
@@ -121,7 +121,7 @@ if (!empty($argv[1]))
         {
           $transport = $arg;
         }
-        elseif (preg_match ('/^(sha1|md5)$/i', $arg))
+        elseif (preg_match ('/^(sha|md5)$/i', $arg))
         {
           $v3['authalgo'] = $arg;
         }
@@ -198,8 +198,8 @@ Observium v".$config['version']." Add Host Tool
 Usage (SNMPv1/2c): ./addhost.php <%Whostname%n> [community] [v1|v2c] [port] [" . implode("|",$config['snmp']['transports']) . "]
 Usage (SNMPv3)   :  Config Defaults : ./addhost.php <%Whostname%n> any v3 [user] [port] [" . implode("|",$config['snmp']['transports']) . "]
                    No Auth, No Priv : ./addhost.php <%Whostname%n> nanp v3 [user] [port] [" . implode("|",$config['snmp']['transports']) . "]
-                      Auth, No Priv : ./addhost.php <%Whostname%n> anp v3 <user> <password> [md5|sha1] [port] [" . implode("|",$config['snmp']['transports']) . "]
-                      Auth,    Priv : ./addhost.php <%Whostname%n> ap v3 <user> <password> <enckey> [md5|sha1] [aes|dsa] [port] [" . implode("|",$config['snmp']['transports']) . "]
+                      Auth, No Priv : ./addhost.php <%Whostname%n> anp v3 <user> <password> [md5|sha] [port] [" . implode("|",$config['snmp']['transports']) . "]
+                      Auth,    Priv : ./addhost.php <%Whostname%n> ap v3 <user> <password> <enckey> [md5|sha] [aes|dsa] [port] [" . implode("|",$config['snmp']['transports']) . "]
 %rRemember to run discovery for the host afterwards.%n
 
 ");
diff --git a/html/pages/device/edit/snmp.inc.php b/html/pages/device/edit/snmp.inc.php
index dd9a44d63e..efe9105773 100644
--- a/html/pages/device/edit/snmp.inc.php
+++ b/html/pages/device/edit/snmp.inc.php
@@ -112,7 +112,7 @@ echo("<br /><table cellpadding=0 cellspacing=0><tr><td>
       <td>
         <select name='authalgo'>
           <option value='MD5'>MD5</option>
-          <option value='SHA1' " . ($device['authalgo'] === "SHA1" ? 'selected' : '') . ">SHA1</option>
+          <option value='SHA' " . ($device['authalgo'] === "SHA" ? 'selected' : '') . ">SHA</option>
         </select>
       </td>
     </tr>
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index c61eb88ff6..f03e9cd090 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -123,7 +123,7 @@ $config['snmp']['community'][0] = "public"; # Communities to try during adding h
 $config['snmp']['v3'][0]['authlevel'] = "noAuthNoPriv";  # noAuthNoPriv | authNoPriv | authPriv
 $config['snmp']['v3'][0]['authname'] = "observium";      # User Name (required even for noAuthNoPriv)
 $config['snmp']['v3'][0]['authpass'] = "";               # Auth Passphrase
-$config['snmp']['v3'][0]['authalgo'] = "MD5";            # MD5 | SHA1
+$config['snmp']['v3'][0]['authalgo'] = "MD5";            # MD5 | SHA
 $config['snmp']['v3'][0]['cryptopass'] = "";             # Privacy (Encryption) Passphrase
 $config['snmp']['v3'][0]['cryptoalgo'] = "AES";          # AES | DES