diff --git a/extras/Projucer/Source/Application/jucer_LoginForm.h b/extras/Projucer/Source/Application/jucer_LoginForm.h
index 399fb48a90..5e4221c805 100644
--- a/extras/Projucer/Source/Application/jucer_LoginForm.h
+++ b/extras/Projucer/Source/Application/jucer_LoginForm.h
@@ -55,7 +55,9 @@ public:
         addAndMakeVisible (passwordEditor);
         initialiseTextField (userIDEditor, userIDLabel);
         addAndMakeVisible (userIDEditor);
-        userIDEditor.setText (ProjucerLicences::getInstance()->getLoginName());
+
+        String userName = ProjucerLicences::getInstance()->getLoginName();
+        userIDEditor.setText (userName.isEmpty() ? getLastUserName() : userName);
 
         initialiseLabel (errorLabel, Font::plain, ProjucerDialogLookAndFeel::getErrorTextColour());
         addChildComponent (errorLabel);
@@ -205,6 +207,8 @@ private:
     void loginButtonClicked()
     {
         loginName = userIDEditor.getText();
+        getGlobalProperties().setValue ("lastUserName", loginName);
+
         password = passwordEditor.getText();
 
         if (! isValidEmail (loginName) || password.isEmpty())
@@ -237,6 +241,11 @@ private:
         rememberLogin = rememberLoginCheckbox.getToggleState();
     }
 
+    String getLastUserName() const
+    {
+        return getGlobalProperties().getValue ("lastUserName");
+    }
+
     void handleInvalidLogin()
     {
         if (!isValidEmail (loginName))