diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index c144f29b..f5ba1921 100644
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -6034,6 +6034,7 @@ func init() {
 	r.HandleFunc("/api/v1/getinfo", handleInfo).Methods("GET", "OPTIONS")
 	r.HandleFunc("/api/v1/getsettings", handleSettings).Methods("GET", "OPTIONS")
 	r.HandleFunc("/api/v1/generateapikey", handleApiGeneration).Methods("GET", "OPTIONS")
+	r.HandleFunc("/api/v1/passwordchange", handlePasswordChange).Methods("POST", "OPTIONS")
 
 	r.HandleFunc("/api/v1/docs", getDocList).Methods("GET", "OPTIONS")
 	r.HandleFunc("/api/v1/docs/{key}", getDocs).Methods("GET", "OPTIONS")
diff --git a/frontend/src/AppCreator.js b/frontend/src/AppCreator.js
index 7619a157..2203d68d 100644
--- a/frontend/src/AppCreator.js
+++ b/frontend/src/AppCreator.js
@@ -465,7 +465,7 @@ const AppCreator = (props) => {
 							break
 						}
 
-						// FIXME: Check if the name already exists
+						// FIXME: If name exists, 
 						// FIXME: Check if first part of parsedname is verb, otherwise use method
 						const parsedname = curname.split("_").join(" ").split("-").join(" ").split("{").join(" ").split("}").join(" ").trim()
 						if (parsedname.length === 0) {
diff --git a/frontend/src/SettingsPage.js b/frontend/src/SettingsPage.js
index f4baa76e..61577420 100644
--- a/frontend/src/SettingsPage.js
+++ b/frontend/src/SettingsPage.js
@@ -209,6 +209,7 @@ const Settings = (props) => {
 						onClick={() => generateApikey()}
 					>Re-Generate APIKEY</Button>
 					<Divider style={{marginTop: "40px"}}/>
+					{/*
 					<h2>Settings</h2>
 					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
 						<TextField
@@ -369,6 +370,7 @@ const Settings = (props) => {
 					</Button>
 					<h3>{formMessage}</h3>
 					<Divider />
+					*/}
 					<h2>Password</h2>
 					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
 						<TextField