diff --git a/Clover/app/src/main/java/org/floens/chan/core/site/common/MultipartHttpCall.java b/Clover/app/src/main/java/org/floens/chan/core/site/common/MultipartHttpCall.java
index 75044987..fc28832b 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/site/common/MultipartHttpCall.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/site/common/MultipartHttpCall.java
@@ -60,7 +60,11 @@ public abstract class MultipartHttpCall extends HttpCall {
     @Override
     public void setup(Request.Builder requestBuilder) {
         requestBuilder.url(url);
-        requestBuilder.addHeader("Referer", url.scheme() + "://" + url.host());
+        String r = url.scheme() + "://" + url.host();
+        if (url.port() != 80 && url.port() != 443) {
+            r += ":" + url.port();
+        }
+        requestBuilder.addHeader("Referer", r);
         requestBuilder.post(formBuilder.build());
     }
 }
diff --git a/Clover/app/src/main/java/org/floens/chan/core/site/common/vichan/VichanActions.java b/Clover/app/src/main/java/org/floens/chan/core/site/common/vichan/VichanActions.java
index d3c405b6..0630a138 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/site/common/vichan/VichanActions.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/site/common/vichan/VichanActions.java
@@ -87,7 +87,7 @@ public class VichanActions extends CommonSite.CommonActions {
 
     @Override
     public void handlePost(ReplyResponse replyResponse, Response response, String result) {
-        Matcher auth = Pattern.compile(".*\"captcha\": ?true.*").matcher(result);
+        Matcher auth = Pattern.compile("\"captcha\": ?true").matcher(result);
         Matcher err = errorPattern().matcher(result);
         if (auth.find()) {
             replyResponse.requireAuthentication = true;
@@ -137,7 +137,7 @@ public class VichanActions extends CommonSite.CommonActions {
     }
 
     public Pattern errorPattern() {
-        return Pattern.compile(".*<h1[^>]*>Error</h1>.*<h2[^>]*>(.*?)</h2>.*");
+        return Pattern.compile("<h1[^>]*>Error</h1>.*<h2[^>]*>(.*?)</h2>");
     }
 
     @Override