diff --git a/demo/tmgmt_demo.install b/demo/tmgmt_demo.install
index a2eeef3..d18eea9 100644
--- a/demo/tmgmt_demo.install
+++ b/demo/tmgmt_demo.install
@@ -33,19 +33,18 @@ function tmgmt_demo_install() {
     variable_set('comment_translatable', '0');
   }
 
-  // Add language skills to the current user.
-  global $user;
-  $user_fields = user_load($user->uid);
+  // Add language skills to the admin user.
+  $user = user_load(1);
 
-  $user_fields->tmgmt_translation_skills[LANGUAGE_NONE][] = array(
+  $user->tmgmt_translation_skills[LANGUAGE_NONE][] = array(
     'language_from' => 'de',
     'language_to'   => 'en',
   );
-  $user_fields->tmgmt_translation_skills[LANGUAGE_NONE][] = array(
+  $user->tmgmt_translation_skills[LANGUAGE_NONE][] = array(
     'language_from' => 'en',
     'language_to'   => 'de',
   );
-  user_save($user_fields);
+  user_save($user, (array) $user);
 
   // Add demo content.
   $node = new stdClass();
@@ -75,7 +74,7 @@ function tmgmt_demo_install() {
 function tmgmt_demo_uninstall() {
   // Remove the content type created by the demo module.
   if (array_key_exists('translatable', node_type_get_names())) {
-    note_type_delete('translatable');
+    node_type_delete('translatable');
     variable_del('node_preview_translatable');
     node_types_rebuild();
     menu_rebuild();