diff --git a/user/edit.php b/user/edit.php
index ead4e64782a..37073356ea1 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -3,8 +3,17 @@
     require_once("../config.php");
     require_once("$CFG->libdir/gdlib.php");
 
-    require_variable($id);       // user id
-    require_variable($course);   // course id
+    optional_variable($id);       // user id
+    optional_variable($course);   // course id
+
+    if (empty($id)) {         // See your own profile by default
+        require_login();
+        $id = $USER->id;
+    }
+
+    if (empty($course)) {     // See it at site level by default
+        $course = SITEID;
+    }
 
     if (! $user = get_record("user", "id", $id)) {
         error("User ID was incorrect");
@@ -30,7 +39,7 @@
         require_login($course->id);
     }
 
-    if ($USER->id <> $user->id and !isadmin()) {
+    if (($USER->id <> $user->id) && !isadmin()) {
         error("You can only edit your own information");
     }
 
@@ -47,6 +56,10 @@
 
     if ($usernew = data_submitted()) {
 
+        if (($USER->id <> $usernew->id) && !isadmin()) {
+            error("You can only edit your own information");
+        }
+
         if (isset($USER->username)) {
             check_for_restricted_user($USER->username, "$CFG->wwwroot/course/view.php?id=$course->id");
         }
diff --git a/user/view.php b/user/view.php
index afffb11c426..b908537286d 100644
--- a/user/view.php
+++ b/user/view.php
@@ -5,11 +5,19 @@
     require_once("../config.php");
     require_once("../mod/forum/lib.php");
 
-    require_variable($id);
-    require_variable($course);
+    optional_variable($id);
+    optional_variable($course);
     optional_variable($enable, "");
     optional_variable($disable, "");
 
+    if (empty($id)) {         // See your own profile by default
+        require_login();
+        $id = $USER->id;
+    }
+
+    if (empty($course)) {     // See it at site level by default
+        $course = SITEID;
+    }
 
     if (! $user = get_record("user", "id", $id) ) {
         error("No such user in this course");