diff --git a/src/com/matburt/mobileorg/OrgFileParser.java b/src/com/matburt/mobileorg/OrgFileParser.java
index 0990e828..901f38f0 100644
--- a/src/com/matburt/mobileorg/OrgFileParser.java
+++ b/src/com/matburt/mobileorg/OrgFileParser.java
@@ -40,7 +40,7 @@ class TitleComponents {
     }
     
     private Pattern prepareTitlePattern () {
-    	if (null == this.titlePattern) {
+    	if (this.titlePattern == null) {
     		StringBuffer pattern = new StringBuffer();
     		pattern.append("^(?:(");
     		pattern.append(TextUtils.join("|", todoKeywords));
diff --git a/src/com/matburt/mobileorg/SettingsActivity.java b/src/com/matburt/mobileorg/SettingsActivity.java
index 415de2f9..c638d3c6 100644
--- a/src/com/matburt/mobileorg/SettingsActivity.java
+++ b/src/com/matburt/mobileorg/SettingsActivity.java
@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.ArrayList;
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.EditText;
@@ -28,6 +29,8 @@ public class SettingsActivity extends Activity implements OnClickListener
 
     private SQLiteDatabase appdb;
 
+    public static String settingsList[] = {"webUrl", "webUser", "webPass", "storage"};
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -58,6 +61,19 @@ public void initializeSettings() {
                     this.settings.put(result.getString(0),
                                       result.getString(1));
                 } while (result.moveToNext());
+                for (int idx = 0; idx < this.settingsList.length; idx++) {
+                    if (!this.settings.containsKey(this.settingsList[idx])) {
+                        if (this.settingsList[idx] == "storage") {
+                            this.settings.put("storage", "internal");
+                        }
+                        else {
+                            this.settings.put(this.settingsList[idx], "");
+                        }
+                        this.appdb.execSQL("INSERT INTO settings (key, val)" +
+                                           " VALUES ('" + this.settingsList[idx] +"','"+
+                                           this.settings.get(this.settingsList[idx]) + "');");
+                    }
+                }
                 this.populateDisplay();
             }
             else {
@@ -68,7 +84,7 @@ public void initializeSettings() {
                 this.appdb.execSQL("INSERT INTO settings (key, val)" +
                                    " VALUES ('webPass', '')");
                 this.appdb.execSQL("INSERT INTO settings (key, val)" +
-                                   " VALUES ('storage', '')");
+                                   " VALUES ('storage', 'internal')");
             }
         }
         result.close();