diff --git a/lib/core/enums.py b/lib/core/enums.py
index 7cc1b3382..44e10138a 100644
--- a/lib/core/enums.py
+++ b/lib/core/enums.py
@@ -71,12 +71,13 @@ class HASH:
 
 # Reference: http://www.zytrax.com/tech/web/mobile_ids.html
 class MOBILES:
-    IPHONE        = "Apple iPhone 4;Apple-iPhone3C1/801.306"
-    BLACKBERRY    = "Blackberry 9800;Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+"
-    NEXUS         = "Google Nexus One;Mozilla/5.0 (Linux; U; Android 2.2; en-US; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
+    BLACKBERRY    = "RIM Blackberry 9800 Torch;Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+"
     GALAXY        = "Samsung Galaxy S;Mozilla/5.0 (Linux; U; Android 2.2; en-US; SGH-T959D Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
-    NOKIA         = "Nokia N97;Mozilla/5.0 (SymbianOS/9.3; U; Series60/3.2 NokiaN79-1/32.001; Profile/MIDP-2.1 Configuration/CLDC-1.1) AppleWebKit/413 (KHTML, like Gecko) Safari/413"
     HP            = "HP iPAQ 6365;Mozilla/4.0 (compatible; MSIE 4.01; Windows CE; PPC; 240x320; HP iPAQ h6300)"
+    HTC           = "HTC Evo;Mozilla/5.0 (Linux; U; Android 2.2; en-us; Sprint APA9292KT Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
+    IPHONE        = "Apple iPhone 4;Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/531.22.7"
+    NEXUS         = "Google Nexus One;Mozilla/5.0 (Linux; U; Android 2.2; en-US; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"
+    NOKIA         = "Nokia N97;Mozilla/5.0 (SymbianOS/9.4; Series60/5.0 NokiaN97-1/10.0.012; Profile/MIDP-2.1 Configuration/CLDC-1.1; en-us) AppleWebKit/525 (KHTML, like Gecko) WicKed/7.1.12344"
 
 class HTTPHEADER:
     ACCEPT_ENCODING     = "Accept-Encoding"
diff --git a/lib/core/option.py b/lib/core/option.py
index 9f4ed59a4..bd600eb2d 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1053,14 +1053,16 @@ def __setHTTPUserAgent():
     """
 
     if conf.mobile:
-        message  = "which smartphone do you want sqlmap to imitate through HTTP User-Agent header?\n"
+        message = "which smartphone do you want sqlmap to imitate "
+        message += "through HTTP User-Agent header?\n"
         items = sorted(getPublicTypeMembers(MOBILES, True))
 
         for count in xrange(len(items)):
             item = items[count]
-            message += "[%d] %s%s\n" % (count + 1, item[:item.find(';')], " (default)" if item==MOBILES.IPHONE else "")
+            message += "[%d] %s%s\n" % (count + 1, item[:item.find(';')], " (default)" if item == MOBILES.IPHONE else "")
 
         test = readInput(message.rstrip('\n'), default=items.index(MOBILES.IPHONE) + 1)
+
         try:
             item = items[int(test) - 1]
         except:
@@ -1087,7 +1089,7 @@ def __setHTTPUserAgent():
         if addDefaultUserAgent:
             conf.httpHeaders.append(("User-Agent", __defaultHTTPUserAgent()))
 
-    elif not kb.userAgents:
+    else:
         debugMsg  = "loading random HTTP User-Agent header(s) from "
         debugMsg += "file '%s'" % paths.USER_AGENTS
         logger.debug(debugMsg)
@@ -1101,7 +1103,6 @@ def __setHTTPUserAgent():
 
             conf.httpHeaders.append((HTTPHEADER.USER_AGENT, __defaultHTTPUserAgent()))
 
-    else:
         count = len(kb.userAgents)
 
         if count == 1: