diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index 3679c17154..49e332bbcc 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -902,8 +902,6 @@ static void handle_hotplug(android_input_data_t *android_data,
       params.idx                 = *port;
       params.vid                 = vendorId;
       params.pid                 = productId;
-      settings->input.pid[*port] = params.pid;
-      settings->input.vid[*port] = params.vid;
 
       strlcpy(params.driver, android_joypad.ident, sizeof(params.driver));
       input_autoconfigure_connect(&params);
@@ -1031,7 +1029,8 @@ static bool android_input_key_pressed(void *data, int key)
    android_input_t *android = (android_input_t*)data;		
    settings_t *settings     = config_get_ptr();		
 
-   if(settings->input.binds[0][key].valid && android_keyboard_port_input_pressed(settings->input.binds[0],key))		
+   if(       settings->input.binds[0][key].valid 
+         && android_keyboard_port_input_pressed(settings->input.binds[0],key))		
       return true;		
 
    if (settings->input.binds[0][key].valid &&		
diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index 4d14a73961..2085b0d1a4 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -281,9 +281,6 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
       params.pid = dinput_joypad_pid(g_joypad_cnt);
 
       input_autoconfigure_connect(&params);
-
-      settings->input.pid[g_joypad_cnt] = params.pid;
-      settings->input.vid[g_joypad_cnt] = params.vid;
    }
 
 #ifdef HAVE_XINPUT
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index 564dc8956a..f09fe97bdb 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -286,8 +286,6 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
       params.idx             = p;
       params.vid             = pad->vid;
       params.pid             = pad->pid;
-      settings->input.pid[p] = params.pid;
-      settings->input.vid[p] = params.vid;
 
       strlcpy(params.driver, udev_joypad.ident,
             sizeof(params.driver));
diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 7b9429a8eb..0f4d9723cb 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -170,9 +170,12 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
          task->title = strdup(msg);
    }
 
-   strlcpy(settings->input.device_names[params->idx],
-         params->name,
-         sizeof(settings->input.device_names[params->idx]));
+   if (!string_is_empty(params->name))
+      strlcpy(settings->input.device_names[params->idx],
+            params->name,
+            sizeof(settings->input.device_names[params->idx]));
+   settings->input.pid[params->idx] = params->pid;
+   settings->input.vid[params->idx] = params->vid;
 
    input_autoconfigure_joypad_reindex_devices();
 }