diff --git a/.gitignore b/.gitignore
index 840292f..851d8a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 config.cfg
 .twitter.db
+.userpass.txt
diff --git a/.userpass.txt.sample b/.userpass.txt.sample
new file mode 100644
index 0000000..55d80f3
--- /dev/null
+++ b/.userpass.txt.sample
@@ -0,0 +1 @@
+-u username:password
diff --git a/config.cfg.sample b/config.cfg.sample
index f749877..cec5df2 100644
--- a/config.cfg.sample
+++ b/config.cfg.sample
@@ -1,6 +1,6 @@
 DIR="pic"
-DOMAIN="https://example.com/twitter"
+DOMAIN="https://serv.mehl.mx/twitter"
 DB=".twitter.db"
-SLSERV="http://ur1.ca"
-SLGREP1="Your ur1 is"
-SLGREP2="http://ur1.ca/[a-zA-Z0-9]*"
+SLSERV="http://link.fsfe.org/index.rb"
+SLGREP1='Your link is: <a href=.*?>.*?</a>'
+SLGREP2="http://l.fsfe.org/[a-zA-Z0-9]*"
diff --git a/twitter-pic.sh b/twitter-pic.sh
index 656c9c9..00a48de 100755
--- a/twitter-pic.sh
+++ b/twitter-pic.sh
@@ -49,7 +49,7 @@ if [ "$DBCHECK" != "" ]; then   # file has already been downloaded
 else                            # file hasn't been downloaded yet
   ok="n"
   while [ "$ok" != "y" ]; do
-    RAND=$(openssl rand -hex 4)
+    RAND=$(openssl rand -hex 3)
     if [ ! -e "$DIR/$RAND.$EXT" ]; then
       ok="y"
     fi
@@ -57,9 +57,8 @@ else                            # file hasn't been downloaded yet
 
   LCIMG="$DIR/$RAND.$EXT"
   LCLINK="$DOMAIN/$LCIMG"
-  
-  SLLINK=$(curl -s "$SLSERV" -d"longurl=$LCLINK" -A "Mozilla" | grep -i "$SLGREP1" | sed -e 's/<[^>]*>//g' | grep -Eo "$SLGREP2")
 
+  SLLINK=$(curl -K .userpass.txt -s "$SLSERV" -d "link=$LCLINK" -A "Mozilla" | grep -P -io "$SLGREP1" | sed -e 's/<[^>]*>//g' | grep -Eo "$SLGREP2")
 
   echo "$TWFILE;$SLLINK;$LCLINK" >> "$DB"