diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 44f8f91..f09447d 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -593,10 +593,15 @@ _edi_project_credentials_missing()
 static Eina_Bool
 _edi_project_credentials_check(void)
 {
-   if (!_edi_project_config->user_fullname || strlen(_edi_project_config->user_fullname) == 0)
+   Edi_Scm_Engine *eng;
+
+   eng = edi_scm_engine_get();
+   if ((!_edi_project_config->user_fullname || strlen(_edi_project_config->user_fullname) == 0) &&
+        !eng->remote_name_get())
      return EINA_FALSE;
 
-   if (!_edi_project_config->user_email || strlen(_edi_project_config->user_email) == 0)
+   if ((!_edi_project_config->user_email || strlen(_edi_project_config->user_email) == 0) &&
+        !eng->remote_email_get())
      return EINA_FALSE;
 
    return EINA_TRUE;
@@ -1093,8 +1098,6 @@ _edi_menu_scm_commit_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
         return;
      }
 
-   edi_scm_credentials_set(_edi_project_config->user_fullname, _edi_project_config->user_email);
-
    chdir(edi_project_get());
 
    /* when program terminates update the filepanel */
diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c
index 65fe269..05b2795 100644
--- a/src/bin/screens/edi_settings.c
+++ b/src/bin/screens/edi_settings.c
@@ -652,6 +652,7 @@ _edi_settings_project_create(Evas_Object *parent)
    Evas_Object *entry_remote;
    Eina_Strbuf *text;
 
+   engine = edi_scm_engine_get();
    frames = elm_box_add(parent);
    frame = _edi_settings_panel_create(frames, _("Project Settings"));
    elm_box_pack_end(frames, frame);
@@ -672,7 +673,7 @@ _edi_settings_project_create(Evas_Object *parent)
    evas_object_show(label);
 
    entry_name = elm_entry_add(table);
-   elm_object_text_set(entry_name, _edi_project_config->user_fullname);
+   elm_object_text_set(entry_name, _edi_project_config->user_fullname ?: engine->remote_name_get());
    elm_entry_single_line_set(entry_name, EINA_TRUE);
    elm_entry_scrollable_set(entry_name, EINA_TRUE);
    evas_object_size_hint_weight_set(entry_name, 0.75, 0.0);
@@ -690,7 +691,7 @@ _edi_settings_project_create(Evas_Object *parent)
    evas_object_show(label);
 
    entry_email = elm_entry_add(table);
-   elm_object_text_set(entry_email, _edi_project_config->user_email);
+   elm_object_text_set(entry_email, _edi_project_config->user_email ?: engine->remote_email_get());
    elm_entry_single_line_set(entry_email, EINA_TRUE);
    elm_entry_scrollable_set(entry_email, EINA_TRUE);
    evas_object_size_hint_weight_set(entry_email, 0.75, 0.0);
@@ -703,7 +704,6 @@ _edi_settings_project_create(Evas_Object *parent)
    if (!edi_scm_enabled())
      return frames;
 
-   engine = edi_scm_engine_get();
    text = eina_strbuf_new();
    eina_strbuf_append(text, _("Source Control"));
    eina_strbuf_append_printf(text, " (%s)", engine->name);