diff --git a/db/reserved_usernames.txt b/db/reserved_usernames.txt
index 77d3bc856e..97e1cdb05a 100644
--- a/db/reserved_usernames.txt
+++ b/db/reserved_usernames.txt
@@ -1,6 +1,7 @@
 # This is a list of reserved usernames to allow for vanity URLs, etc.
 # Taken from the following:
 # https://gist.github.com/caseyohara/1453705/bd38325ae2b562572afaa119efa59529c057bc85
+# https://github.com/shouldbee/reserved-usernames
 
 # Stuff we care about
 storyteller
@@ -19,148 +20,6 @@ netflix
 twitter
 unreal
 
-# Generic reserved words
-about
-account
-activate
-add
-admin
-administrator
-api
-app
-apps
-archive
-archives
-auth
-blog
-cache
-cancel
-careers
-cart
-changelog
-checkout
-codereview
-compare
-config
-configuration
-connect
-contact
-create
-delete
-direct_messages
-documentation
-download
-downloads
-edit
-email
-employment
-enterprise
-faq
-favorites
-feed
-feedback
-feeds
-fleet
-fleets
-follow
-followers
-following
-friend
-friends
-gist
-group
-groups
-help
-home
-hosting
-hostmaster
-idea
-ideas
-index
-info
-invitations
-invite
-is
-it
-job
-jobs
-json
-language
-languages
-lists
-login
-logout
-logs
-mail
-map
-maps
-mine
-mis
-news
-oauth
-oauth_clients
-offers
-openid
-order
-orders
-organizations
-plans
-popular
-post
-postmaster
-privacy
-projects
-put
-recruitment
-register
-remove
-replies
-root
-rss
-sales
-save
-search
-security
-sessions
-settings
-shop
-signup
-sitemap
-ssl
-ssladmin
-ssladministrator
-sslwebmaster
-status
-stories
-styleguide
-subscribe
-subscriptions
-support
-sysadmin
-sysadministrator
-terms
-tour
-translations
-trends
-unfollow
-unsubscribe
-update
-url
-user
-weather
-webmaster
-widget
-widgets
-wiki
-ww
-www
-wwww
-xfn
-xml
-xmpp
-yaml
-yml
-
 # Top 50 languages by speaking population
 chinese
 mandarin
@@ -213,3 +72,747 @@ thai
 dutch
 yoruba
 sindhi
+
+# Generic reserved words
+0
+about
+about
+access
+account
+account
+accounts
+activate
+activate
+activities
+activity
+ad
+add
+add
+address
+adm
+admin
+admin
+administration
+administrator
+administrator
+ads
+adult
+advertising
+affiliate
+affiliates
+ajax
+all
+alpha
+analysis
+analytics
+android
+anon
+anonymous
+api
+api
+app
+app
+apps
+apps
+archive
+archive
+archives
+archives
+article
+asct
+asset
+atom
+auth
+auth
+authentication
+avatar
+backup
+balancer-manager
+banner
+banners
+beta
+billing
+bin
+blog
+blog
+blogs
+board
+book
+bookmark
+bot
+bots
+bug
+business
+cache
+cache
+cadastro
+calendar
+call
+campaign
+cancel
+cancel
+captcha
+career
+careers
+careers
+cart
+cart
+categories
+category
+cgi
+cgi-bin
+changelog
+changelog
+chat
+check
+checking
+checkout
+checkout
+client
+cliente
+clients
+code
+codereview
+codereview
+comercial
+comment
+comments
+communities
+community
+company
+compare
+compare
+compras
+config
+config
+configuration
+configuration
+connect
+connect
+contact
+contact
+contact-us
+contact_us
+contactus
+contest
+contribute
+corp
+create
+create
+css
+dashboard
+data
+db
+default
+delete
+delete
+demo
+design
+designer
+destroy
+dev
+devel
+developer
+developers
+diagram
+diary
+dict
+dictionary
+die
+dir
+direct_messages
+direct_messages
+directory
+dist
+doc
+docs
+documentation
+documentation
+domain
+download
+download
+downloads
+downloads
+ecommerce
+edit
+edit
+editor
+edu
+education
+email
+email
+employment
+employment
+empty
+end
+enterprise
+enterprise
+entries
+entry
+error
+errors
+eval
+event
+exit
+explore
+facebook
+faq
+faq
+favorite
+favorites
+favorites
+feature
+features
+feed
+feed
+feedback
+feedback
+feeds
+feeds
+file
+files
+first
+flash
+fleet
+fleet
+fleets
+fleets
+flog
+follow
+follow
+followers
+followers
+following
+following
+forgot
+form
+forum
+forums
+founder
+free
+friend
+friend
+friends
+friends
+ftp
+gadget
+gadgets
+game
+games
+get
+ghost
+gift
+gifts
+gist
+gist
+github
+graph
+group
+group
+groups
+groups
+guest
+guests
+help
+help
+home
+home
+homepage
+host
+hosting
+hosting
+hostmaster
+hostmaster
+hostname
+howto
+hpg
+html
+http
+httpd
+https
+i
+iamges
+icon
+icons
+id
+idea
+idea
+ideas
+ideas
+image
+images
+imap
+img
+index
+index
+indice
+info
+info
+information
+inquiry
+instagram
+intranet
+invitations
+invitations
+invite
+invite
+ipad
+iphone
+irc
+is
+is
+issue
+issues
+it
+it
+item
+items
+java
+javascript
+job
+job
+jobs
+jobs
+join
+js
+json
+json
+jump
+knowledgebase
+language
+language
+languages
+languages
+last
+ldap-status
+legal
+license
+link
+links
+linux
+list
+lists
+lists
+log
+log-in
+log-out
+log_in
+log_out
+login
+login
+logout
+logout
+logs
+logs
+m
+mac
+mail
+mail
+mail1
+mail2
+mail3
+mail4
+mail5
+mailer
+mailing
+maintenance
+manager
+manual
+map
+map
+maps
+maps
+marketing
+master
+me
+media
+member
+members
+message
+messages
+messenger
+microblog
+microblogs
+mine
+mine
+mis
+mis
+mob
+mobile
+movie
+movies
+mp3
+msg
+msn
+music
+musicas
+mx
+my
+mysql
+name
+named
+nan
+navi
+navigation
+net
+network
+new
+news
+news
+newsletter
+nick
+nickname
+notes
+noticias
+notification
+notifications
+notify
+ns
+ns1
+ns10
+ns2
+ns3
+ns4
+ns5
+ns6
+ns7
+ns8
+ns9
+null
+oauth
+oauth
+oauth_clients
+oauth_clients
+offer
+offers
+offers
+official
+old
+online
+openid
+openid
+operator
+order
+order
+orders
+orders
+organization
+organizations
+organizations
+overview
+owner
+owners
+page
+pager
+pages
+panel
+password
+payment
+perl
+phone
+photo
+photoalbum
+photos
+php
+phpmyadmin
+phppgadmin
+phpredisadmin
+pic
+pics
+ping
+plan
+plans
+plans
+plugin
+plugins
+policy
+pop
+pop3
+popular
+popular
+portal
+post
+post
+postfix
+postmaster
+postmaster
+posts
+pr
+premium
+press
+price
+pricing
+privacy
+privacy
+privacy-policy
+privacy_policy
+privacypolicy
+private
+product
+products
+profile
+project
+projects
+projects
+promo
+pub
+public
+purpose
+put
+put
+python
+query
+random
+ranking
+read
+readme
+recent
+recruit
+recruitment
+recruitment
+register
+register
+registration
+release
+remove
+remove
+replies
+replies
+report
+reports
+repositories
+repository
+req
+request
+requests
+reset
+roc
+root
+root
+rss
+rss
+ruby
+rule
+sag
+sale
+sales
+sales
+sample
+samples
+save
+save
+school
+script
+scripts
+search
+search
+secure
+security
+security
+self
+send
+server
+server-info
+server-status
+service
+services
+session
+sessions
+sessions
+setting
+settings
+settings
+setup
+share
+shop
+shop
+show
+sign-in
+sign-up
+sign_in
+sign_up
+signin
+signout
+signup
+signup
+site
+sitemap
+sitemap
+sites
+smartphone
+smtp
+soporte
+source
+spec
+special
+sql
+src
+ssh
+ssl
+ssl
+ssladmin
+ssladmin
+ssladministrator
+ssladministrator
+sslwebmaster
+sslwebmaster
+staff
+stage
+staging
+start
+stat
+state
+static
+stats
+status
+status
+store
+stores
+stories
+stories
+style
+styleguide
+styleguide
+stylesheet
+stylesheets
+subdomain
+subscribe
+subscribe
+subscriptions
+subscriptions
+suporte
+support
+support
+svn
+swf
+sys
+sysadmin
+sysadmin
+sysadministrator
+sysadministrator
+system
+tablet
+tablets
+tag
+talk
+task
+tasks
+team
+teams
+tech
+telnet
+term
+terms
+terms
+terms-of-service
+terms_of_service
+termsofservice
+test
+test1
+test2
+test3
+teste
+testing
+tests
+theme
+themes
+thread
+threads
+tmp
+todo
+tool
+tools
+top
+topic
+topics
+tos
+tour
+tour
+translations
+translations
+trends
+trends
+tutorial
+tux
+tv
+twitter
+undef
+unfollow
+unfollow
+unsubscribe
+unsubscribe
+update
+update
+upload
+uploads
+url
+url
+usage
+user
+user
+username
+users
+usuario
+vendas
+ver
+version
+video
+videos
+visitor
+watch
+weather
+weather
+web
+webhook
+webhooks
+webmail
+webmaster
+webmaster
+website
+websites
+welcome
+widget
+widget
+widgets
+widgets
+wiki
+wiki
+win
+windows
+word
+work
+works
+workshop
+ww
+ww
+wws
+www
+www
+www1
+www2
+www3
+www4
+www5
+www6
+www7
+wwws
+wwww
+wwww
+xfn
+xfn
+xml
+xml
+xmpp
+xmpp
+xpg
+xxx
+yaml
+yaml
+year
+yml
+yml
+you
+yourdomain
+yourname
+yoursite
+yourusername