diff --git a/facebook-user-capitalisation b/facebook-user-capitalisation
deleted file mode 100755
index fa66648..0000000
--- a/facebook-user-capitalisation
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-curl -s "https://www.facebook.com/${1}/" | grep -Po '<meta property="og:url" content="https://www\.facebook\.com/\K[^"/]+'
diff --git a/snscrape-facebook-user b/snscrape-facebook-user
index 60a94f7..7c1d621 100755
--- a/snscrape-facebook-user
+++ b/snscrape-facebook-user
@@ -1,2 +1,14 @@
 #!/bin/bash
-user="$1"; { echo "https://www.facebook.com/${user}/"; snscrape -v facebook-user "${user}" | perl -pe 's,[?&]\K__xts__%5B0%5D=[^&]+?(&|$),,; s,[?&]\K__tn__=[^&]+?(&|$),,; s,[?&]\Keid=[^&]+?(&|$),,; s,[?&]$,,;' | awk '{print} /\?type=/ {print substr($0, 1, index($0, "?type=") - 1)}' | awk '!seen[$0]++'; } > "facebook-@${user}"
+origUser="$1";
+user="$(snscrape --max-results 1 facebook-user "${origUser}" | grep -Po '^https?://www\.facebook\.com/\K[^/]+')"
+if [[ "${user}" ]]
+then
+	if [[ "${user}" != "${origUser}" ]]; then echo "Username fix: ${origUser} -> ${user}" >&2; fi
+	{
+		echo "https://www.facebook.com/${user}/"
+		snscrape -v facebook-user "${user}" | \
+			perl -pe 's,[?&]\K__xts__%5B0%5D=[^&]+?(&|$),,; s,[?&]\K__tn__=[^&]+?(&|$),,; s,[?&]\Keid=[^&]+?(&|$),,; s,[?&]$,,;' | \
+			awk '{print} /\?type=/ {print substr($0, 1, index($0, "?type=") - 1)}' | \
+			awk '!seen[$0]++'
+	} > "facebook-@${user}"
+fi
diff --git a/snscrape-twitter-user b/snscrape-twitter-user
index a822644..321f988 100755
--- a/snscrape-twitter-user
+++ b/snscrape-twitter-user
@@ -1,2 +1,11 @@
 #!/bin/bash
-user="$1"; { echo "https://twitter.com/${user}"; snscrape -v twitter-user "${user}"; } > "twitter-@${user}"
+origUser="$1"
+user="$(snscrape --max-results 1 twitter-user "${origUser}" | grep -Po '^https?://twitter\.com/\K[^/]+')"
+if [[ "${user}" ]]
+then
+	if [[ "${user}" != "${origUser}" ]]; then echo "Username fix: ${origUser} -> ${user}" >&2; fi
+	{
+		echo "https://twitter.com/${user}"
+		snscrape -v twitter-user "${user}"
+	} > "twitter-@${user}"
+fi