diff --git a/src/main/frontend/handler/repo.cljs b/src/main/frontend/handler/repo.cljs
index 6c08199e1a..26058f33d1 100644
--- a/src/main/frontend/handler/repo.cljs
+++ b/src/main/frontend/handler/repo.cljs
@@ -69,9 +69,7 @@
   (spec/validate :repos/url repo-url)
   (let [repo-dir (util/get-repo-dir repo-url)
         format (state/get-preferred-format)
-        path (str "pages/contents." (if (= (name format) "markdown")
-                                      "md"
-                                      (name format)))
+        path (str "pages/contents." (config/get-file-extension format))
         file-path (str "/" path)
         default-content (util/default-content-with-title format "contents")]
     (p/let [_ (-> (fs/mkdir (str repo-dir "/pages"))
@@ -147,7 +145,7 @@
 (defn create-default-files!
   [repo-url]
   (spec/validate :repos/url repo-url)
-  (when-let [name (get-in @state/state [:me :name])]
+  (when (state/logged?)
     (create-config-file-if-not-exists repo-url)
     (create-today-journal-if-not-exists repo-url)
     (create-contents-file repo-url)
@@ -416,7 +414,7 @@
        (fn [result]
          (state/set-git-clone-repo! "")
          (state/set-current-repo! repo-url)
-         (db/start-db-conn! (:me @state/state) repo-url)
+         (db/start-db-conn! (state/get-me) repo-url)
          (db/mark-repo-as-cloned repo-url))
        (fn [e]
          (println "Clone failed, error: ")
@@ -523,7 +521,7 @@
   (spec/validate :repos/url repo-url)
   (->
    (p/let [_ (clone repo-url)
-           _ (git-handler/git-set-username-email! repo-url (:me @state/state))]
+           _ (git-handler/git-set-username-email! repo-url (state/get-me))]
      (load-db-and-journals! repo-url nil true)
      (periodically-pull-and-push repo-url {:pull-now? false})
      ;; (periodically-persist-app-metadata repo-url)
diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs
index 2196867925..d7c2eb2a22 100644
--- a/src/main/frontend/state.cljs
+++ b/src/main/frontend/state.cljs
@@ -712,9 +712,14 @@
   []
   (:me @state))
 
-(defn logged?
+(defn get-name
   []
-  (some? (:name (get-me))))
+  (:name (get-me)))
+
+(defn logged?
+  "Whether the user has logged in."
+  []
+  (some? (get-name)))
 
 (defn set-draw!
   [value]