diff --git a/modules/profile.module b/modules/profile.module
index 7dae358955b927383045fbea6b4ddc12c633f605..d382687dcb975c325dc1e4e2810d7f77a34f861b 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -88,7 +88,7 @@ function profile_load_profile(&$user) {
 
 function profile_save_profile($edit, $user) {
   db_query('DELETE FROM {profile_values} WHERE uid = %d', $user->uid);
-  $result = db_query('SELECT fid, name FROM profile_fields');
+  $result = db_query('SELECT fid, name FROM {profile_fields}');
   while ($field = db_fetch_object($result)) {
     if ($edit[$field->name]) {
       db_query("INSERT INTO {profile_values} (fid, uid, value) VALUES (%d, %d, '%s')", $field->fid, $user->uid, $edit[$field->name]);
@@ -180,8 +180,8 @@ function profile_validate_profile($edit) {
   $result = db_query('SELECT * FROM {profile_fields} ORDER BY category, weight');
 
   while ($field = db_fetch_object($result)) {
-    if ($field->type == 'url') {
-      if ($edit[$field->name] && !valid_url($edit[$field->name], true)) {
+    if ($edit[$field->name]) {
+      if ($field->type == 'url' && !valid_url($edit[$field->name], true)) {
         return t("The value provided for '%field' is not a valid URL.", array('%field' => $field->title));
       }
     }
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 7dae358955b927383045fbea6b4ddc12c633f605..d382687dcb975c325dc1e4e2810d7f77a34f861b 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -88,7 +88,7 @@ function profile_load_profile(&$user) {
 
 function profile_save_profile($edit, $user) {
   db_query('DELETE FROM {profile_values} WHERE uid = %d', $user->uid);
-  $result = db_query('SELECT fid, name FROM profile_fields');
+  $result = db_query('SELECT fid, name FROM {profile_fields}');
   while ($field = db_fetch_object($result)) {
     if ($edit[$field->name]) {
       db_query("INSERT INTO {profile_values} (fid, uid, value) VALUES (%d, %d, '%s')", $field->fid, $user->uid, $edit[$field->name]);
@@ -180,8 +180,8 @@ function profile_validate_profile($edit) {
   $result = db_query('SELECT * FROM {profile_fields} ORDER BY category, weight');
 
   while ($field = db_fetch_object($result)) {
-    if ($field->type == 'url') {
-      if ($edit[$field->name] && !valid_url($edit[$field->name], true)) {
+    if ($edit[$field->name]) {
+      if ($field->type == 'url' && !valid_url($edit[$field->name], true)) {
         return t("The value provided for '%field' is not a valid URL.", array('%field' => $field->title));
       }
     }