diff --git a/www/drive/main.js b/www/drive/main.js
index 9bdf42e4a..3f7335c95 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -16,11 +16,12 @@ define([
 
     var $ = window.jQuery;
     var saveAs = window.saveAs;
-    var $iframe = $('#pad-iframe').contents();
-    var ifrw = $('#pad-iframe')[0].contentWindow;
-
 
+    // Use `$(function () {});` to make sure the html is loaded before doing anything else
+    $(function () {
 
+    var $iframe = $('#pad-iframe').contents();
+    var ifrw = $('#pad-iframe')[0].contentWindow;
 
     Cryptpad.addLoadingScreen();
     var onConnectError = function (info) {
@@ -2032,5 +2033,5 @@ define([
         }
     });
 
-
+    });
 });
diff --git a/www/register/main.js b/www/register/main.js
index d5e17c228..c41825595 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -39,101 +39,101 @@ define([
         } else {
             $main.find('#userForm').removeClass('hidden');
         }
-    });
 
-    // text and password input fields
-    var $uname = $('#username');
-    var $passwd = $('#password');
-    var $confirm = $('#password-confirm');
+        // text and password input fields
+        var $uname = $('#username');
+        var $passwd = $('#password');
+        var $confirm = $('#password-confirm');
 
-    if (sessionStorage.login_user) {
-        $uname.val(sessionStorage.login_user);
-    }
-    if (sessionStorage.login_pass) {
-        $passwd.val(sessionStorage.login_pass);
-    }
+        if (sessionStorage.login_user) {
+            $uname.val(sessionStorage.login_user);
+        }
+        if (sessionStorage.login_pass) {
+            $passwd.val(sessionStorage.login_pass);
+        }
 
-    [ $uname, $passwd, $confirm]
-    .some(function ($el) { if (!$el.val()) { $el.focus(); return true; } });
+        [ $uname, $passwd, $confirm]
+        .some(function ($el) { if (!$el.val()) { $el.focus(); return true; } });
 
-    // checkboxes
-    var $checkImport = $('#import-recent');
-    var $checkAcceptTerms = $('#accept-terms');
-    var $checkPromise = $('#promise');
+        // checkboxes
+        var $checkImport = $('#import-recent');
+        var $checkAcceptTerms = $('#accept-terms');
+        var $checkPromise = $('#promise');
 
-    var $register = $('button#register');
+        var $register = $('button#register');
 
-    $register.click(function () {
-        var uname = $uname.val();
-        var passwd = $passwd.val();
-        var confirmPassword = $confirm.val();
+        $register.click(function () {
+            var uname = $uname.val();
+            var passwd = $passwd.val();
+            var confirmPassword = $confirm.val();
 
-        var shouldImport = $checkImport[0].checked;
-        var doesAccept = $checkAcceptTerms[0].checked;
-        var doesPromise = $checkPromise[0].checked;
+            var shouldImport = $checkImport[0].checked;
+            var doesAccept = $checkAcceptTerms[0].checked;
+            var doesPromise = $checkPromise[0].checked;
 
-        /* basic validation */
-        if (passwd !== confirmPassword) { // do their passwords match?
-            return void Cryptpad.alert(Messages.register_passwordsDontMatch);
-        }
+            /* basic validation */
+            if (passwd !== confirmPassword) { // do their passwords match?
+                return void Cryptpad.alert(Messages.register_passwordsDontMatch);
+            }
 
-        if (!doesAccept) { // do they accept the terms of service?
-            return void Cryptpad.alert(Messages.register_mustAcceptTerms);
-        }
+            if (!doesAccept) { // do they accept the terms of service?
+                return void Cryptpad.alert(Messages.register_mustAcceptTerms);
+            }
 
-        if (!doesPromise) { // do they promise to remember their password?
-            return void Cryptpad.alert(Messages.register_mustRememberPass);
-        }
+            if (!doesPromise) { // do they promise to remember their password?
+                return void Cryptpad.alert(Messages.register_mustRememberPass);
+            }
 
-        Cryptpad.addLoadingScreen(Messages.login_hashing);
-        Login.loginOrRegister(uname, passwd, true, function (err, result) {
-            if (err) {
-                switch (err) {
-                    case 'NO_SUCH_USER':
-                        Cryptpad.removeLoadingScreen(function () {
-                            Cryptpad.alert(Messages.login_noSuchUser);
-                        });
-                        break;
-                    case 'INVAL_USER':
-                        Cryptpad.removeLoadingScreen(function () {
-                            Cryptpad.alert(Messages.login_invalUser);
-                        });
-                        break;
-                    case 'INVAL_PASS':
-                        Cryptpad.removeLoadingScreen(function () {
-                            Cryptpad.alert(Messages.login_invalPass);
-                        });
-                        break;
-                    default: // UNHANDLED ERROR
-                        Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
+            Cryptpad.addLoadingScreen(Messages.login_hashing);
+            Login.loginOrRegister(uname, passwd, true, function (err, result) {
+                if (err) {
+                    switch (err) {
+                        case 'NO_SUCH_USER':
+                            Cryptpad.removeLoadingScreen(function () {
+                                Cryptpad.alert(Messages.login_noSuchUser);
+                            });
+                            break;
+                        case 'INVAL_USER':
+                            Cryptpad.removeLoadingScreen(function () {
+                                Cryptpad.alert(Messages.login_invalUser);
+                            });
+                            break;
+                        case 'INVAL_PASS':
+                            Cryptpad.removeLoadingScreen(function () {
+                                Cryptpad.alert(Messages.login_invalPass);
+                            });
+                            break;
+                        default: // UNHANDLED ERROR
+                            Cryptpad.errorLoadingScreen(Messages.login_unhandledError);
+                    }
                 }
-            }
-            var proxy = result.proxy;
+                var proxy = result.proxy;
 
-            localStorage.User_hash = result.userHash;
+                localStorage.User_hash = result.userHash;
 
-            Cryptpad.eraseTempSessionValues();
-            if (shouldImport) {
-                sessionStorage.migrateAnonDrive = 1;
-            }
+                Cryptpad.eraseTempSessionValues();
+                if (shouldImport) {
+                    sessionStorage.migrateAnonDrive = 1;
+                }
 
-            proxy.login_name = uname;
-            proxy[Cryptpad.displayNameKey] = uname;
-            proxy.initializing = true;
-
-            Cryptpad.whenRealtimeSyncs(result.realtime, function () {
-                Cryptpad.login(result.userHash, result.userName, function () {
-                    if (sessionStorage.redirectTo) {
-                        var h = sessionStorage.redirectTo;
-                        var parser = document.createElement('a');
-                        parser.href = h;
-                        if (parser.origin === window.location.origin) {
-                            delete sessionStorage.redirectTo;
-                            window.location.href = h;
-                            return;
+                proxy.login_name = uname;
+                proxy[Cryptpad.displayNameKey] = uname;
+                proxy.initializing = true;
+
+                Cryptpad.whenRealtimeSyncs(result.realtime, function () {
+                    Cryptpad.login(result.userHash, result.userName, function () {
+                        if (sessionStorage.redirectTo) {
+                            var h = sessionStorage.redirectTo;
+                            var parser = document.createElement('a');
+                            parser.href = h;
+                            if (parser.origin === window.location.origin) {
+                                delete sessionStorage.redirectTo;
+                                window.location.href = h;
+                                return;
+                            }
                         }
-                    }
-                    window.location.href = '/drive/';
+                        window.location.href = '/drive/';
+                    });
                 });
             });
         });