diff --git a/webcontroller/ad_click.go b/webcontroller/ad_click.go
index 36a83c0..67ec7ef 100644
--- a/webcontroller/ad_click.go
+++ b/webcontroller/ad_click.go
@@ -27,7 +27,7 @@ func (wc *WebController) serveAdClick(w http.ResponseWriter, r *http.Request, p
 
 	// Log a view on the file
 	if err := api.PostFileView(p.ByName("id"), wc.viewTokenOrBust()); err != nil {
-		log.Warn("Failed to log view")
+		log.Error("Failed to log view: %s", err)
 	}
 }
 
diff --git a/webcontroller/admin_panel.go b/webcontroller/admin_panel.go
index 8969693..137b96d 100644
--- a/webcontroller/admin_panel.go
+++ b/webcontroller/admin_panel.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"html/template"
 	"net/http"
-	"strings"
 
 	"fornaxian.com/pixeldrain-web/pixelapi"
 	"github.com/Fornaxian/log"
@@ -65,9 +64,6 @@ func (wc *WebController) adminGlobalsForm(td *TemplateData, r *http.Request) (f
 	if f.ReadInput(r) {
 		var successfulUpdates = 0
 		for k, v := range f.Fields {
-			// Remove carriage returns from input
-			v.EnteredValue = strings.ReplaceAll(v.EnteredValue, "\r", "")
-
 			if v.EnteredValue == globalsMap[v.Name] {
 				continue // Change changes, no need to update
 			}
diff --git a/webcontroller/forms.go b/webcontroller/forms.go
index 733c649..db43257 100644
--- a/webcontroller/forms.go
+++ b/webcontroller/forms.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"html/template"
 	"net/http"
+	"strings"
 )
 
 // Form is a form which can be rendered in HTML and submitted
@@ -99,7 +100,8 @@ func (f *Form) ReadInput(r *http.Request) (success bool) {
 	f.Submitted = true
 
 	for i, field := range f.Fields {
-		field.EnteredValue = r.FormValue(field.Name)
+		// Remove carriage returns
+		field.EnteredValue = strings.ReplaceAll(r.FormValue(field.Name), "\r", "")
 
 		if field.DefaultValue == "" {
 			field.DefaultValue = field.EnteredValue