diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
index 9b43068ae44445859c7d14c0187734f194a2d6a2..d2ec2f58503595291005da91cd8a83f74d36d6e2 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php
@@ -41,6 +41,7 @@ class UserAgentParserEnhanced
         'BO' => 'BangOlufsen',
         'BQ' => 'BenQ',
         'BS' => 'BenQ-Siemens',
+        'BX' => 'bq',
         'CA' => 'Cat',
         'CK' => 'Cricket',
         'CL' => 'Compal',
diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml
index 632accb00b557abd0bb476cf9024d1d9a56124bf..7502d4e1922cc3187174c38c023c7a8bb5af0ede 100644
--- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml
+++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml
@@ -10,7 +10,7 @@
 
 # HTC
 HTC:
-  regex: 'HTC|Sprint (?:APA|ATP)|ADR[a-z0-9]+|Desire [a-z]+ Build|NexusHD2|Amaze 4G Build'
+  regex: 'HTC|Sprint (?:APA|ATP)|ADR[a-z0-9]+|Desire[ _][a-z0-9]+ Build|NexusHD2|Amaze 4G Build|Sensation[ _][a-z0-9]+ Build'
   device: 'smartphone'
   models:
     - regex: 'NexusHD2' # custom rom for hd2
@@ -33,7 +33,7 @@ HTC:
       model: '$1'
     - regex: 'HTC;(?: )?([a-z0-9 ]+)'
       model: '$1'
-    - regex: '(Desire [a-z]+|Amaze 4G) Build'
+    - regex: '(Desire[ _][a-z0-9]+|Amaze 4G|Sensation[ _][a-z0-9]+) Build'
       model: '$1'
     - regex: '(ADR.+) Build'
       model: '$1'
@@ -264,7 +264,7 @@ BBK:
   regex: 'vivo'
   device: 'smartphone'
   models:
-    - regex: 'vivo ([^/;]*) Build'
+    - regex: 'vivo ([^/;]+) Build'
       model: 'Vivo $1'
     - regex: 'vivo_([a-z0-9]+)'
       model: 'Vivo $1'
@@ -299,6 +299,17 @@ BenQ:
   device: 'feature phone'
   model: '$1'
 
+# bq
+bq:
+  regex: 'bq ([^/;]+) Build'
+  device: 'tablet'
+  models:
+    - regex: 'bq (Aquaris [^/;]+) Build'
+      model: '$1'
+      device: 'smartphone'
+    - regex: 'bq ([^/;]+) Build'
+      model: '$1'
+
 # Capitel
 Capitel:
   regex: 'Capitel-([a-z0-9]+)'
@@ -749,7 +760,7 @@ Mitsubishi:
 
 # motorola
 Motorola:
-  regex: 'MOT|(?<!AN)DROID ?(?:Build|([a-z0-9]+))|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM 2|(?:XT|MZ|MB|ME)[0-9]{3}(?:\(Defy\))? Build'
+  regex: 'MOT|(?<!AN)DROID ?(?:Build|([a-z0-9]+))|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM ([^;/]*)Build|(?:XT|MZ|MB|ME)[0-9]{3,4}(?:\(Defy\))? Build'
   device: 'smartphone'
   models:
     - regex: 'Motorola[ \-]([a-z0-9]+)'
@@ -766,13 +777,13 @@ Motorola:
       model: 'DROID $1'
     - regex: 'portalmmm/2.0 ((?:E378i|L6|L7|V3)[a-z0-9]+)'
       model: '$1'
-    - regex: 'XOOM 2'
+    - regex: '(XOOM [^;/]*)Build'
       device: 'tablet'
-      model: 'MZ607'
+      model: '$1'
     - regex: '(MZ[0-9]{3}) Build'
       device: 'tablet'
       model: '$1'
-    - regex: '((?:ME|MB|XT)[0-9]{3}(?:\(Defy\))?) Build'
+    - regex: '((?:ME|MB|XT)[0-9]{3,4}(?:\(Defy\))?) Build'
       model: '$1'
 
 # myphone
@@ -927,7 +938,7 @@ Siemens:
 
 # Samsung
 Samsung:
-  regex: 'SAMSUNG|S(?:CH|GH|PH|EC|AM|HV|HW)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|EK-GC[0-9]{3}'
+  regex: 'SAMSUNG|S(?:CH|GH|PH|EC|AM|HV|HW|M)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]|EK-GC[0-9]{3}'
   device: 'smartphone'
   models:
     - regex: '(GT-(P|N8|N5)[0-9]+[a-z]?)'
@@ -941,7 +952,7 @@ Samsung:
       model: '$1'
     - regex: 'SAMSUNG;[ ]?([a-z0-9 ]+)'
       model: '$1'
-    - regex: '((?:SCH|SGH|SPH|SHV|SHW|GT)-[a-z0-9]+)'
+    - regex: '((?:SCH|SGH|SPH|SHV|SHW|GT|SM)-[a-z0-9]+)'
       model: '$1'
     - regex: 'EK-GC([0-9]{3})'
       device: 'camera'
@@ -953,6 +964,8 @@ Samsung:
     - regex: 'SMART-TV'
       device: 'tv'
       model: 'Smart TV'
+    - regex: '(Galaxy [^/;]+) Build'
+      model: '$1'
     - regex: '(Galaxy [a-z0-9]+)'
       model: '$1'
     - regex: '(?:portalmmm|o2imode)/2\.0 ([SZ][a-z0-9]+)'
@@ -1004,12 +1017,12 @@ PolyPad:
 
 # Prestigio
 Prestigio:
-  regex: '((?:PMP|PAP)[0-9]+[a-z0-9]+) Build'
+  regex: '((?:PMP|PAP)[0-9]+[a-z0-9_]+) Build'
   device: 'tablet'
   models:
-    - regex: '(PMP[0-9]+[a-z0-9]+) Build'
+    - regex: '(PMP[0-9]+[a-z0-9_]+) Build'
       model: '$1'
-    - regex: '(PAP[0-9]+[a-z0-9]+) Build'
+    - regex: '(PAP[0-9]+[a-z0-9_]+) Build'
       model: '$1'
       device: 'smartphone'
 
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index 860990af3299f9db177a9255997903fb4d796d20..1ad093e0e49eb0e519bd311aa4a745ec7def9a07 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -125,11 +125,11 @@
                     <input type="hidden" name="form_nonce" id="reset_form_nonce" value="{{ nonce }}"/>
 
                     <input type="password" name="form_password" id="reset_form_password" class="input" value="" size="20"
-                           tabindex="20"
+                           tabindex="20" autocomplete="off"
                            placeholder="{{ 'General_Password'|translate }}"/>
 
                     <input type="password" name="form_password_bis" id="reset_form_password_bis" class="input" value=""
-                           size="20" tabindex="30"
+                           size="20" tabindex="30" autocomplete="off"
                            placeholder="{{ 'Login_PasswordRepeat'|translate }}"/>
                 </fieldset>
 
diff --git a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
index e819c3f9edd5d4a854ef6ebbbee4562c37739856..7401129e186356e2891bb4141c3a3c3678aac0d1 100644
--- a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
+++ b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml
@@ -1369,9 +1369,9 @@
     short_name: AN
     version:
   device:
-    type:
-    brand:
-    model:
+    type: smartphone
+    brand: PR
+    model: PAP4040 DUO
   os_family: Android
   browser_family: Android Browser
 - 
@@ -2025,9 +2025,9 @@
     short_name: AN
     version:
   device:
-    type:
-    brand:
-    model:
+    type: tablet
+    brand: BX
+    model: Edison
   os_family: Android
   browser_family: Android Browser
 - 
@@ -2409,9 +2409,9 @@
     short_name: AN
     version:
   device:
-    type:
-    brand:
-    model:
+    type: tablet
+    brand: BX
+    model: Edison
   os_family: Android
   browser_family: Android Browser
 - 
@@ -2425,9 +2425,9 @@
     short_name: AN
     version:
   device:
-    type:
-    brand:
-    model:
+    type: tablet
+    brand: BX
+    model: Edison
   os_family: Android
   browser_family: Android Browser
 - 
@@ -2601,9 +2601,9 @@
     short_name: AN
     version:
   device:
-    type:
-    brand:
-    model:
+    type: smartphone
+    brand: PR
+    model: PAP4040 DUO
   os_family: Android
   browser_family: Android Browser
 - 
@@ -18587,7 +18587,7 @@
   device:
     type: tablet
     brand: MR
-    model: MZ607
+    model: XOOM 2
   os_family: Android
   browser_family: Android Browser
 - 
@@ -21163,7 +21163,7 @@
   device:
     type: tablet
     brand: MR
-    model: MZ607
+    model: XOOM 2
   os_family: Android
   browser_family: Chrome
 -
@@ -21661,4 +21661,420 @@
     brand: HT
     model: APA9292KT (Sprint)
   os_family: Android
-  browser_family: Android Browser
\ No newline at end of file
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; de-de; Galaxy S II Build/GRJ22) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: SA
+    model: Galaxy S II
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; ru-ru; Sensation_Z710e Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: HT
+    model: Sensation Z710e
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 2.3.5; en-gb; Desire_A8181 Build/GRJ90) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+  os:
+    name: Android
+    short_name: AND
+    version: 2.3
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: HT
+    model: Desire A8181
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; bq Maxwell Plus Build/1.0.3 20121201-14:07) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.0
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: tablet
+    brand: BX
+    model: Maxwell Plus
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; es-es; bq Aquaris 4 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: BX
+    model: Aquaris 4
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; es-es; bq Aquaris Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: tablet
+    brand: BX
+    model: Aquaris
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; es-es; bq Elcano Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: tablet
+    brand: BX
+    model: Elcano
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.1; es-es; bq Aquaris 5 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: BX
+    model: Aquaris 5
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.2.1; bq Aquaris 5.7 Build/JOP40D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2
+  browser:
+    name: Chrome Mobile
+    short_name: CM
+    version: 32.0
+  device:
+    type: smartphone
+    brand: BX
+    model: Aquaris 5.7
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (iPad; CPU OS 6_0_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Mercury/8.0.1 Mobile/10A523 Safari/8536.25
+  os:
+    name: iOS
+    short_name: IOS
+    version: 6.0
+  browser:
+    name: Mercury
+    short_name: ME
+    version: 8.0
+  device:
+    type: tablet
+    brand: AP
+    model: iPad
+  os_family: iOS
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (iPad; CPU OS 6_0_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) CriOS/31.0.1650.18 Mobile/10A523 Safari/8536.25
+  os:
+    name: iOS
+    short_name: IOS
+    version: 6.0
+  browser:
+    name: Chrome Mobile iOS
+    short_name: CI
+    version: 31.0
+  device:
+    type: tablet
+    brand: AP
+    model: iPad
+  os_family: iOS
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (iPad2,1; iPad; U; CPU OS 7_0_4 like Mac OS X; pl_PL) com.google.GooglePlus/29676 (KHTML, like Gecko) Mobile/K93AP (gzip)
+  os:
+    name: iOS
+    short_name: IOS
+    version: 7.0
+  browser:
+    name: Mobile Safari
+    short_name: MF
+    version: 
+  device:
+    type: tablet
+    brand: AP
+    model: iPad
+  os_family: iOS
+  browser_family: Safari
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.3; SM-P600 Build/JSS15J) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.3
+  browser:
+    name: Chrome
+    short_name: CH
+    version: 32.0
+  device:
+    type: smartphone
+    brand: SA
+    model: SM-P600
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.3; SM-N900V Build/JSS15J) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.58 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.3
+  browser:
+    name: Chrome Mobile
+    short_name: CM
+    version: 32.0
+  device:
+    type: smartphone
+    brand: SA
+    model: SM-N900V
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.3; SM-N900W8 Build/JSS15J) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.3
+  browser:
+    name: Chrome Mobile
+    short_name: CM
+    version: 32.0
+  device:
+    type: smartphone
+    brand: SA
+    model: SM-N900W8
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.3; en-ca; SM-N900W8 Build/JSS15J) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.3
+  browser:
+    name: Chrome Mobile
+    short_name: CM
+    version: 28.0
+  device:
+    type: smartphone
+    brand: SA
+    model: SM-N900W8
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; az-az; SM-T211 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: SA
+    model: SM-T211
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-ca; SM-G730W8 Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: smartphone
+    brand: SA
+    model: SM-G730W8
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: UCWEB/2.0 (MIDP-2.0; U; Adr 4.1.2; en-US; SM-T211) U2/1.0.0 UCBrowser/8.8.1.359 U2/1.0.0 Mobile
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1
+  browser:
+    name: UC Browser
+    short_name: UC
+    version: 8.8
+  device:
+    type: smartphone
+    brand: SA
+    model: SM-T211
+  os_family: Android
+  browser_family: Unknown
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 3.1; en-us; Xoom Build/HMJ25) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13
+  os:
+    name: Android
+    short_name: AND
+    version: 3.1
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: tablet
+    brand: MR
+    model: Xoom
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4.2; Xoom Wifi Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4
+  browser:
+    name: Chrome
+    short_name: CH
+    version: 32.0
+  device:
+    type: tablet
+    brand: MR
+    model: Xoom Wifi
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; ru-ru; PMP7170B3G_DUO Build/JZO54K) AppleWebKit/534.30 (KHTML, \xd0\xba\xd0\xb0\xd0\xba Gecko) Version/4.0 \xd0\x9c\xd0\xbe\xd0\xb1\xd0\xb8\xd0\xbb\xd1\x8c\xd0\xbd\xd1\x8b\xd0\xb9Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.1
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: tablet
+    brand: PR
+    model: PMP7170B3G DUO
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; cs-cz; PMP5101C_QUAD Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2
+  browser:
+    name: Android Browser
+    short_name: AN
+    version: 
+  device:
+    type: tablet
+    brand: PR
+    model: PMP5101C QUAD
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.2.2; XT1030 Build/12.9.0Q2.X-160-OBK_TA-14-7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.90 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.2
+  browser:
+    name: Chrome Mobile
+    short_name: CM
+    version: 27.0
+  device:
+    type: smartphone
+    brand: MR
+    model: XT1030
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4; XT1080 Build/SU2-3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4
+  browser:
+    name: Chrome Mobile
+    short_name: CM
+    version: 32.0
+  device:
+    type: smartphone
+    brand: MR
+    model: XT1080
+  os_family: Android
+  browser_family: Chrome
+-
+  user_agent: Mozilla/5.0 (Linux; Android 4.4; XT1056 Build/13.11.3Q2.X-69-3-8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36
+  os:
+    name: Android
+    short_name: AND
+    version: 4.4
+  browser:
+    name: Chrome Mobile
+    short_name: CM
+    version: 31.0
+  device:
+    type: smartphone
+    brand: MR
+    model: XT1056
+  os_family: Android
+  browser_family: Chrome
\ No newline at end of file