diff --git a/kubernetes/Chart.yaml b/kubernetes/Chart.yaml
index bb0838ad..9e4b793e 100644
--- a/kubernetes/Chart.yaml
+++ b/kubernetes/Chart.yaml
@@ -9,9 +9,9 @@ keywords:
 - video
 - privacy
 home: https://invidio.us/
-icon: https://raw.githubusercontent.com/omarroth/invidious/05988c1c49851b7d0094fca16aeaf6382a7f64ab/assets/favicon-32x32.png
+icon: https://raw.githubusercontent.com/iv-org/invidious/05988c1c49851b7d0094fca16aeaf6382a7f64ab/assets/favicon-32x32.png
 sources:
-- https://github.com/omarroth/invidious
+- https://github.com/iv-org/invidious
 maintainers:
 - name: Leon Klingele
   email: mail@leonklingele.de
diff --git a/kubernetes/values.yaml b/kubernetes/values.yaml
index 4d037022..08def6e4 100644
--- a/kubernetes/values.yaml
+++ b/kubernetes/values.yaml
@@ -1,7 +1,7 @@
 name: invidious
 
 image:
-  repository: omarroth/invidious
+  repository: iv-org/invidious
   tag: latest
   pullPolicy: Always
 
diff --git a/shard.yml b/shard.yml
index 2b59786e..e0fa1d25 100644
--- a/shard.yml
+++ b/shard.yml
@@ -3,6 +3,7 @@ version: 0.20.1
 
 authors:
   - Omar Roth <omarroth@protonmail.com>
+  - Invidous team
 
 targets:
   invidious:
diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr
index e41f8317..a4101ef1 100644
--- a/src/invidious/helpers/helpers.cr
+++ b/src/invidious/helpers/helpers.cr
@@ -95,7 +95,7 @@ class Config
   property port : Int32 = 3000                                     # Port to listen for connections (overrided by command line argument)
   property host_binding : String = "0.0.0.0"                       # Host to bind (overrided by command line argument)
   property pool_size : Int32 = 100                                 # Pool size for HTTP requests to youtube.com and ytimg.com (each domain has a separate pool of `pool_size`)
-  property admin_email : String = "omarroth@protonmail.com"        # Email for bug reports
+  property admin_email : String = "FIXME"        # Email for bug reports
 
   @[YAML::Field(converter: Preferences::StringToCookies)]
   property cookies : HTTP::Cookies = HTTP::Cookies.new               # Saved cookies in "name1=value1; name2=value2..." format
diff --git a/src/invidious/users.cr b/src/invidious/users.cr
index 6bc2acd2..4b16affc 100644
--- a/src/invidious/users.cr
+++ b/src/invidious/users.cr
@@ -427,7 +427,7 @@ def generate_captcha(key, db)
 end
 
 def generate_text_captcha(key, db)
-  response = make_client(TEXTCAPTCHA_URL, &.get("/omarroth@protonmail.com.json").body)
+  response = make_client(TEXTCAPTCHA_URL, &.get("/FIXME.json").body)
   response = JSON.parse(response)
 
   tokens = response["a"].as_a.map do |answer|