diff --git a/build.go b/build.go
index fcd7289cd6a..ac7707f76fc 100644
--- a/build.go
+++ b/build.go
@@ -238,7 +238,7 @@ func createPackage(options linuxPackageOptions) {
 		"-C", packageRoot,
 		"--vendor", "Grafana",
 		"--url", "http://grafana.org",
-		"--license", "Apache 2.0",
+		"--license", "\"Apache 2.0\"",
 		"--maintainer", "contact@grafana.org",
 		"--config-files", options.configFilePath,
 		"--config-files", options.ldapFilePath,
diff --git a/public/app/features/sidemenu/sidemenu.ts b/public/app/features/sidemenu/sidemenu.ts
index e5cb96d20fe..520bd2f864a 100644
--- a/public/app/features/sidemenu/sidemenu.ts
+++ b/public/app/features/sidemenu/sidemenu.ts
@@ -52,7 +52,7 @@ class SideMenuCtrl {
    if (this.contextSrv.hasRole('Admin')) {
      this.orgMenu.push({section: this.user.orgName, cssClass: 'dropdown-menu-title'});
      this.orgMenu.push({
-       text: "Settings",
+       text: "Preferences",
        url: this.getUrl("/org"),
      });
      this.orgMenu.push({