diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 7d18d1de851..bd0fab0d548 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -193,8 +193,8 @@ void VcsBaseSubmitEditor::setParameters(const VcsBaseSubmitEditorParameters &par
         }
     }
     // Do we have user fields?
-    if (!settings.nickNameFieldListFile.value().isEmpty())
-        createUserFields(settings.nickNameFieldListFile.value());
+    if (!settings.nickNameFieldListFile().isEmpty())
+        createUserFields(settings.nickNameFieldListFile());
 
     // wrapping. etc
     slotUpdateEditorSettings();
@@ -241,14 +241,12 @@ static inline QStringList fieldTexts(const QString &fileContents)
     return rc;
 }
 
-void VcsBaseSubmitEditor::createUserFields(const QString &fieldConfigFile)
+void VcsBaseSubmitEditor::createUserFields(const FilePath &fieldConfigFile)
 {
     FileReader reader;
-    if (!reader.fetch(FilePath::fromString(fieldConfigFile),
-                      QIODevice::Text,
-                      Core::ICore::dialogParent())) {
+    if (!reader.fetch(fieldConfigFile, QIODevice::Text, Core::ICore::dialogParent()))
         return;
-    }
+
     // Parse into fields
     const QStringList fields = fieldTexts(QString::fromUtf8(reader.data()));
     if (fields.empty())
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index 5277b3efcf6..2c3123d7368 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -114,7 +114,7 @@ private:
     void slotSetFieldNickName(int);
     void slotUpdateEditorSettings();
 
-    void createUserFields(const QString &fieldConfigFile);
+    void createUserFields(const Utils::FilePath &fieldConfigFile);
     bool checkSubmitMessage(QString *errorMessage) const;
     bool runSubmitMessageCheckScript(const Utils::FilePath &script, QString *errorMessage) const;
     QString promptForNickName();