diff --git a/arduino.module b/arduino.module
index efbed13..8ed4b79 100644
--- a/arduino.module
+++ b/arduino.module
@@ -66,7 +66,7 @@ function arduino_devices_add(){
   $form['name'] = array(
     '#title' => t('Device name'),
     '#type' => 'textfield',
-    '#description' => t('The name for this device (e.g. Weather station 002')
+    '#description' => t('The name for this device (e.g. Weather station 002)')
   );
   $form['content_type'] = array(
     '#title' => t('Content type to map to'),
@@ -77,7 +77,8 @@ function arduino_devices_add(){
   $form['user'] = array(
     '#title' => t('Username for this device'),
     '#type' => 'textfield',
-    '#description' => t('Posts from the devcie will be made under this username.'),
+    '#autocomplete_path' => 'user/autocomplete',
+    '#description' => t('Posts from the device will be made under this username.'),
   );
   
   
@@ -94,17 +95,16 @@ function arduino_devices_add_submit($form, $form_state) {
   $name      = $form_state['values']['name'];
   $node_type = $form_state['values']['content_type'];
   $user_name = $form_state['values']['user'];
-   
+  
+  //Get $uid by Username
+  $loaded_user = user_load_by_name($user_name);
+  $user_id = $loaded_user->uid;
   //Generate token
   $token = crypt($name . $node_type . $user_name);
   drupal_set_message("Token: ".$token, 'status');
-  
-  //Get uid
-  $uid = 2;
-  
   //Save device 
   $sql = "INSERT INTO {arduino_device} (device_name, token, node_type, uid) VALUES (:name, :token, :node_type, :uid);";
-  db_query($sql, array(':name' => $name, ':token' => $token, ':node_type' => $node_type, ':uid' => $uid));
+  db_query($sql, array(':name' => $name, ':token' => $token, ':node_type' => $node_type, ':uid' => $user_id));
 }
 
 function arduino_get_code(){