diff --git a/.gitattributes b/.gitattributes
index cfa572fe..37e6bb8e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-*.gohtml linguist-index=golang
+*.gohtml linguist-language=golang
 *.js linguist-detectable=false
 *.yml linguist-detectable=false
 *.json linguist-detectable=false
diff --git a/LICENSE b/LICENSE
index 1c506dda..1125e62e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -117,8 +117,8 @@ form of a work.
 
   A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming index, one that
-is widely used among developers working in that index.
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
   The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
diff --git a/handlers/setup.go b/handlers/setup.go
index e2c43066..81c2f531 100644
--- a/handlers/setup.go
+++ b/handlers/setup.go
@@ -90,6 +90,7 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) {
 		CreatedAt:   utils.Now(),
 		UseCdn:      null.NewNullBool(false),
 		Footer:      null.NewNullString(""),
+		Language:    confgs.Language,
 	}
 
 	log.Infoln("Creating new Core")
diff --git a/types/configs/configs_form.go b/types/configs/configs_form.go
index ef0fb4c2..6b6ba782 100644
--- a/types/configs/configs_form.go
+++ b/types/configs/configs_form.go
@@ -23,6 +23,7 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 	description := g("description")
 	domain := g("domain")
 	email := g("email")
+	language := g("language")
 
 	if project == "" || username == "" || password == "" {
 		err := errors.New("Missing required elements on setup form")
@@ -38,6 +39,7 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 	p.Set("DB_DATABASE", dbDatabase)
 	p.Set("NAME", project)
 	p.Set("DESCRIPTION", description)
+	p.Set("LANGUAGE", language)
 
 	confg := &DbConfig{
 		DbConn:      dbConn,
@@ -53,6 +55,7 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 		Password:    password,
 		Email:       email,
 		Location:    utils.Directory,
+		Language:    language,
 	}
 
 	return confg, nil