diff --git a/pages/user.go b/pages/user.go
index 8269d46..54854d9 100644
--- a/pages/user.go
+++ b/pages/user.go
@@ -3,7 +3,6 @@ package pages
 import (
 	"context"
 	"log"
-	"net/http"
 	"os"
 	"strings"
 
@@ -42,20 +41,8 @@ func HandleUser(c *fiber.Ctx) error {
 	// Declare Array used for displaying data
 	var userArray []User
 
-	resp, err := http.Get("https://github.com/" + c.Params("user"))
-	if err != nil {
-		log.Println(err)
-	}
-	if resp.StatusCode == 404 {
-		// I need a better way to do this
-		return c.Status(404).Render("error", fiber.Map{
-			"error": "User " + c.Params("user") + " not found",
-		})
-	}
-
 	// User README
 	var readmee string
-
 	err0 := requests.
 		URL("https://raw.githubusercontent.com/" + c.Params("user") + "/" + c.Params("user") + "/master/README.md").
 		ToString(&readmee).
@@ -121,7 +108,7 @@ func HandleUser(c *fiber.Ctx) error {
 		sc.OnHTML("div.js-yearly-contributions", func(e *colly.HTMLElement) {
 			Scrape.Contributions = e.ChildText("h2")
 		})
-	} else {
+	} else if Scrape.Type == "http://schema.org/Organization" {
 		sc.OnHTML("div.container-xl div.flex-md-items-center div.flex-1", func(e *colly.HTMLElement) {
 			// Main info
 			Scrape.Name = e.ChildText("h1.h2")
@@ -146,6 +133,10 @@ func HandleUser(c *fiber.Ctx) error {
 				Scrape.OrgMembers = append(Scrape.OrgMembers, strings.TrimPrefix(el.Attr("alt"), "@"))
 			})
 		})
+	} else {
+		return c.Status(404).Render("error", fiber.Map{
+			"error": "User " + c.Params("user") + " not found",
+		})
 	}
 	sc.Visit("https://github.com/" + c.Params("user") + "/")
 	// Fixing the output a bit