diff --git a/ChangeLog b/ChangeLog
index a17b23844b..07a11d3bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - issue #11798 Fix handling of databases with dot in a name
 - issue #11820 Fix hiding of page content behind menu
 - issue #11780 FROM clause not generated after loading search bookmark
+- issue #11826 Fix creating/editing VIEW with DEFINER containing special chars
 
 4.5.3.1 (2015-12-25)
 - issue #11774 Undefined offset 2
diff --git a/view_create.php b/view_create.php
index 5ea2aa3364..3ec2ef7c50 100644
--- a/view_create.php
+++ b/view_create.php
@@ -58,7 +58,9 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     }
 
     if (! empty($_REQUEST['view']['definer'])) {
-        $sql_query .= $sep . ' DEFINER = ' . $_REQUEST['view']['definer'];
+        $arr = explode('@', $_REQUEST['view']['definer']);
+        $sql_query .= $sep . 'DEFINER=' . PMA_Util::backquote($arr[0]);
+        $sql_query .= '@' . PMA_Util::backquote($arr[1]) . ' ';
     }
 
     if (isset($_REQUEST['view']['sql_security'])) {