diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3302441..a66c61d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
 target_compile_options(
 ${PROJECT_NAME} PRIVATE $<$<C_COMPILER_ID:Clang,AppleClang>:-Wno-quoted-include-in-framework-header
                                 -Wno-comma>)
-#set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 set_target_properties(
 ${PROJECT_NAME}
 PROPERTIES AUTOMOC ON
diff --git a/config-utils.cpp b/config-utils.cpp
index 29421fd..fa457ad 100644
--- a/config-utils.cpp
+++ b/config-utils.cpp
@@ -93,7 +93,8 @@ QIcon ConfigUtils::getPlatformIconFromEndpoint(QString endpoint)
 		return QIcon(":/aitum/media/twitter.png");
 	} else if (endpoint.contains(QString::fromUtf8("livepush.trovo.live"))) { // trovo
 		return QIcon(":/aitum/media/trovo.png");
-	} else if (endpoint.contains(QString::fromUtf8(".facebook.com"))) { // facebook
+	} else if (endpoint.contains(QString::fromUtf8(".facebook.com")) ||
+		   endpoint.contains(QString::fromUtf8(".fbcdn.net"))) { // facebook
 		return QIcon(":/aitum/media/facebook.png");
 	} else { // unknown
 		return QIcon(":/aitum/media/unknown.png");
diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
index 09c82c0..689e908 100644
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -99,7 +99,7 @@ FacebookOutput="Facebook Output"
 FacebookServiceInfo="Please complete the following fields to add a new Facebook output."
 FacebookServiceInfoEdit="Please complete the following fields to edit this Facebook output."
 FacebookServer="Facebook Server"
-FacebookServerInfo="The stream server URL is preset for Facebook, you do not need to change it."
+FacebookServerInfo="The stream server URL is preset for Facebook, you do not need to change it. Or you can copy one from <a href='https://www.facebook.com/live/ingests/'>Facebook Live Ingests page</a>"
 FacebookStreamKey="Facebook Stream Key"
 FacebookStreamKeyInfo="Please enter your stream key, you can find this on your <a href='https://www.facebook.com/live/producer?ref=OBS'>Facebook Producer page</a>."
 
diff --git a/output-dialog.cpp b/output-dialog.cpp
index 0e01135..0da6d60 100644
--- a/output-dialog.cpp
+++ b/output-dialog.cpp
@@ -370,7 +370,8 @@ OutputDialog::OutputDialog(QDialog *parent, QString name, QString server, QStrin
 		layout->addWidget(WizardInfoTwitter(true));
 	} else if (outputServer.contains(QString::fromUtf8("livepush.trovo.live"))) { // trovo
 		layout->addWidget(WizardInfoTrovo(true));
-	} else if (outputServer.contains(QString::fromUtf8(".facebook.com"))) { // facebook
+	} else if (outputServer.contains(QString::fromUtf8(".fbcdn.net")) ||
+		   outputServer.contains(QString::fromUtf8(".facebook.com"))) { // facebook
 		layout->addWidget(WizardInfoFacebook(true));
 	} else { // unknown
 		layout->addWidget(WizardInfoUnknown(true));
@@ -1034,8 +1035,9 @@ QWidget *OutputDialog::WizardInfoFacebook(bool edit)
 	formLayout->addRow(generateFormLabel("OutputName"), outputNameField);
 
 	// Server field
-	auto serverSelection = generateOutputServerField(confirmButton, true, edit);
-	serverSelection->setText("rtmps://rtmp-api.facebook.com:443/rtmp/");
+	auto serverSelection = generateOutputServerField(confirmButton, false, edit);
+	if (!edit)
+		serverSelection->setText("rtmps://rtmp-api.facebook.com:443/rtmp/");
 
 	formLayout->addRow(generateFormLabel("FacebookServer"), serverSelection);