diff --git a/AUTHORS.h b/AUTHORS.h
index a81715fb2..b9ddbc5ac 100644
--- a/AUTHORS.h
+++ b/AUTHORS.h
@@ -11,44 +11,46 @@
 
 //VCMI PROJECT CODE CONTRIBUTORS:
 const std::vector<std::vector<std::string>> contributors = {
-//   Task          Name                    Aka                      E-Mail
-   { "Idea",       "Michał Urbańczyk",     "Tow",                   "impono@gmail.com"             },
-   { "Idea",       "Mateusz B.",           "Tow dragon",            "matcio1@gmail.com"            },
+	//Task          Name                   Aka                    E-Mail
+	{ "Idea"      , "Mateusz B."         , "Tow dragon"         , "matcio1@gmail.com"            },
+	{ "Idea"      , "Michał Urbańczyk"   , "Tow"                , "impono@gmail.com"             },
 
-   { "Developing", "Andrea Palmate",       "afxgroup",              "andrea@amigasoft.net"         },
-   { "Developing", "Alexander Shishkin",   "alexvins",              ""                             },
-   { "Developing", "Rafal R.",             "ambtrip",               "ambtrip@wp.pl"                },
-   { "Developing", "Andrii Danylchenko",   "",                      ""                             },
-   { "Developing", "Benjamin Gentner",     "beegee",                ""                             },
-   { "Developing", "Piotr Wójcik",         "Chocimier",             "chocimier@tlen.pl"            },
-   { "Developing", "Dmitry Orlov",         "",                      "shubus.corporation@gmail.com" },
-   { "Developing", "",                     "Dydzio",                "blood990@gmail.com"           },
-   { "Developing", "Andrzej Żak",          "godric3",               ""                             },
-   { "Developing", "Henning Koehler",      "henningkoehlernz",      "henning.koehler.nz@gmail.com" },
-   { "Developing", "Ivan Savenko",         "",                      "saven.ivan@gmail.com"         },
-   { "Developing", "",                     "kambala-decapitator",   "decapitator@ukr.net"          },
-   { "Developing", "Fenghuang Rumeng",     "kdmcser",               "zqtndfj@gmail.com"            },
-   { "Developing", "",                     "krs0",                  ""                             },
-   { "Developing", "",                     "Laserlicht",            ""                             },
-   { "Developing", "Alexey",               "Macron1Robot",          ""                             },
-   { "Developing", "Michał Kalinowski",    "",                      "feniks_fire@o2.pl"            },
-   { "Developing", "Vadim Glazunov",       "neweagle",              "neweagle@gmail.com"           },
-   { "Developing", "Andrey Cherkas",       "nordsoft",              "nordsoft@yahoo.com"           },
-   { "Developing", "Rickard Westerlund",   "Onion Knight",          "onionknigh@gmail.com"         },
-   { "Developing", "Yifeng Sun",           "phoebus118",            "pkusunyifeng@gmail.com"       },
-   { "Developing", "",                     "rilian-la-te",          ""                             },
-   { "Developing", "",                     "SoundSSGood",           ""                             },
-   { "Developing", "Stefan Pavlov",        "Ste",                   "mailste@gmail.com"            },
-   { "Developing", "Arseniy Shestakov",    "SXX",                   "me@arseniyshestakov.com"      },
-   { "Developing", "Lukasz Wychrystenko",  "tezeriusz",             "t0@czlug.icis.pcz.pl"         },
-   { "Developing", "Trevor Standley",      "tstandley",             ""                             },
-   { "Developing", "Vadim Markovtsev",     "",                      "gmarkhor@gmail.com"           },
-   { "Developing", "Frank Zago",           "ubuntux",               ""                             },
-   { "Developing", "",                     "vmarkovtsev",           ""                             },
-   { "Developing", "Tom Zielinski",        "Warmonger",             "Warmonger@vp.pl"              },
-   { "Developing", "Xiaomin Ding",         "",                      "dingding303@gmail.com"        },
+	{ "Developing", "Alexander Shishkin" , "alexvins"           , ""                             },
+	{ "Developing", "Alexey"             , "Macron1Robot"       , ""                             },
+	{ "Developing", "Andrea Palmate"     , "afxgroup"           , "andrea@amigasoft.net"         },
+	{ "Developing", "Andrey Cherkas"     , "nordsoft"           , "nordsoft@yahoo.com"           },
+	{ "Developing", "Andrii Danylchenko" , ""                   , ""                             },
+	{ "Developing", "Andrzej Żak"        , "godric3"            , ""                             },
+	{ "Developing", "Arseniy Shestakov"  , "SXX"                , "me@arseniyshestakov.com"      },
+	{ "Developing", "Benjamin Gentner"   , "beegee"             , ""                             },
+	{ "Developing", "Dmitry Orlov"       , ""                   , "shubus.corporation@gmail.com" },
+	{ "Developing", ""                   , "Dydzio"             , "blood990@gmail.com"           },
+	{ "Developing", "Fenghuang Rumeng"   , "kdmcser"            , "zqtndfj@gmail.com"            },
+	{ "Developing", "Frank Zago"         , "ubuntux"            , ""                             },
+	{ "Developing", "Henning Koehler"    , "henningkoehlernz"   , "henning.koehler.nz@gmail.com" },
+	{ "Developing", "Ivan Savenko"       , ""                   , "saven.ivan@gmail.com"         },
+	{ "Developing", ""                   , "Laserlicht"         , ""                             },
+	{ "Developing", "Lukasz Wychrystenko", "tezeriusz"          , "t0@czlug.icis.pcz.pl"         },
+	{ "Developing", "Michał Kalinowski"  , ""                   , "feniks_fire@o2.pl"            },
+	{ "Developing", "Piotr Wójcik"       , "Chocimier"          , "chocimier@tlen.pl"            },
+	{ "Developing", "Rafal R."           , "ambtrip"            , "ambtrip@wp.pl"                },
+	{ "Developing", "Rickard Westerlund" , "Onion Knight"       , "onionknigh@gmail.com"         },
+	{ "Developing", ""                   , "SoundSSGood"        , ""                             },
+	{ "Developing", "Stefan Pavlov"      , "Ste"                , "mailste@gmail.com"            },
+	{ "Developing", "Tom Zielinski"      , "Warmonger"          , "Warmonger@vp.pl"              },
+	{ "Developing", "Trevor Standley"    , "tstandley"          , ""                             },
+	{ "Developing", "Vadim Glazunov"     , "neweagle"           , "neweagle@gmail.com"           },
+	{ "Developing", "Vadim Markovtsev"   , ""                   , "gmarkhor@gmail.com"           },
+	{ "Developing", "Xiaomin Ding"       , ""                   , "dingding303@gmail.com"        },
+	{ "Developing", "Yifeng Sun"         , "phoebus118"         , "pkusunyifeng@gmail.com"       },
+	{ "Developing", ""                   , "kambala-decapitator", "decapitator@ukr.net"          },
+	{ "Developing", ""                   , "krs0"               , ""                             },
+	{ "Developing", ""                   , "rilian-la-te"       , ""                             },
+	{ "Developing", ""                   , "vmarkovtsev"        , ""                             },
 
-   { "Testing",    "Ben Yan",              "by003",                 "benyan9110@gmail.com,"        },
-   { "Testing",    "",                     "Misiokles",             ""                             },
-   { "Testing",    "",                     "Povelitel",             ""                             },
+	{ "Testing"   , "Ben Yan"            , "by003"              , "benyan9110@gmail.com"         },
+	{ "Testing"   , ""                   , "Misiokles"          , ""                             },
+	{ "Testing"   , ""                   , "Povelitel"          , ""                             },
+
+	// List is ordered by "Name" (if empty than "Aka" will used as sorting key)
 };
diff --git a/client/mainmenu/CreditsScreen.cpp b/client/mainmenu/CreditsScreen.cpp
index 778f0a729..d2ab5a482 100644
--- a/client/mainmenu/CreditsScreen.cpp
+++ b/client/mainmenu/CreditsScreen.cpp
@@ -39,7 +39,7 @@ CreditsScreen::CreditsScreen(Rect rect)
 	{
 		if(element[0] != contributorsTask)
 			contributorsText += "\r\n\r\n{" + LIBRARY->generaltexth->translate("vcmi.credits." + boost::to_lower_copy(element[0])) + ":}\r\n";
-		contributorsText += (element[2] != "" ? element[2] : element[1]) + "\r\n";
+		contributorsText += (element[1] != "" ? element[1] : element[2]) + "\r\n";
 		contributorsTask = element[0];
 	}