diff --git a/static/src/js/app/oj/account/avatar.js b/static/src/js/app/oj/account/avatar.js
index 04368b52..4780e266 100644
--- a/static/src/js/app/oj/account/avatar.js
+++ b/static/src/js/app/oj/account/avatar.js
@@ -1,5 +1,6 @@
 require(["jquery", "bsAlert", "csrfToken"], function ($, bsAlert, csrfTokenHeader) {
-    var avatar="";
+    var avatar = "";
+
     function changeAvatar(event) {
         avatar = $(event.target).attr('src');
         $('#current_avatar').attr('src', avatar);
@@ -7,27 +8,27 @@ require(["jquery", "bsAlert", "csrfToken"], function ($, bsAlert, csrfTokenHeade
 
     $('.avatar-item').click(changeAvatar);
 
-    $('#save_avatar').click(function(){
+    $('#save_avatar').click(function () {
         if (avatar)
             $.ajax({
-                    beforeSend: csrfTokenHeader,
-                    url: "/api/account/userprofile/",
-                    data: {
-                        avatar: avatar
-                    },
-                    dataType: "json",
-                    method: "put",
-                    success: function (data) {
-                        if (!data.code) {
-                            bsAlert("已保存!");
-                        }
-                        else{
-                            bsAlert(data.data);
-                        }
-                    },
-                    error: function () {
-                        bsAlert("额 好像出错了，请刷新页面重试。如还有问题，请填写页面导航栏上的反馈。")
+                beforeSend: csrfTokenHeader,
+                url: "/api/account/userprofile/",
+                data: {
+                    avatar: avatar
+                },
+                dataType: "json",
+                method: "put",
+                success: function (data) {
+                    if (!data.code) {
+                        bsAlert("已保存!");
                     }
+                    else {
+                        bsAlert(data.data);
+                    }
+                },
+                error: function () {
+                    bsAlert("额 好像出错了，请刷新页面重试。如还有问题，请填写页面导航栏上的反馈。")
+                }
 
             });
         else
diff --git a/template/src/oj/account/avatar.html b/template/src/oj/account/avatar.html
index 39daa513..d551c4a9 100644
--- a/template/src/oj/account/avatar.html
+++ b/template/src/oj/account/avatar.html
@@ -1,50 +1,51 @@
 {% extends "oj_base.html" %}
 {% block title %}
-更换头像
+    更换头像
 {% endblock %}
 {% block body %}
-<div class="container main">
+    <div class="container main">
 
-    <div class="col-lg-2">
-        <ul class="list-group">
-            <li class="list-group-header">通用设置</li>
-            <li class="list-group-item"><a href="/account/settings/">个人信息</a></li>
-            <li class="list-group-item active"><a href="/account/settings/avatar/">更换头像</a></li>
-            <li class="list-group-item"><a href="/change_password/">修改密码</a></li>
-        </ul>
-    </div>
-    <div class="col-lg-3">
-        <img src="{{ user.userprofile.avatar }}" class="img-responsive"
-             style="height: 200px;width: 200px;" id="current_avatar">
-        <br>
-        <div class="form-group left">
-            <button id="save_avatar" type="submit" class="btn btn-primary">保存</button>
+        <div class="col-lg-2">
+            <ul class="list-group">
+                <li class="list-group-header">通用设置</li>
+                <li class="list-group-item"><a href="/account/settings/">个人信息</a></li>
+                <li class="list-group-item active"><a href="/account/settings/avatar/">更换头像</a></li>
+                <li class="list-group-item"><a href="/change_password/">修改密码</a></li>
+            </ul>
+        </div>
+        <div class="col-lg-3">
+            <img src="{{ user.userprofile.avatar }}" class="img-responsive"
+                 style="height: 200px;width: 200px;" id="current_avatar">
+            <br>
+
+        </div>
+        <div class="col-lg-6">
+            <div>
+                <div class="row">
+                    {% for i in "aaaaaaaaaaaaaaaaaaaa" %}
+                        <div class="col-lg-2 avatar-item">
+                            <div>
+                                <img src="/static/img/avatar/avatar-{{ forloop.counter }}.png" style="cursor:pointer">
+                            </div>
+                        </div>
+                    {% endfor %}
+
+                </div>
+
+                <div title="Coding.net 是深圳市扣钉网络科技有限公司打造的国内最大的一站式云端开发平台，提供包括代码托管，项目管理，产品演示，WebIDE 等工具。">
+                    <img src="https://coding.net/static/d0aa9dd75e2500930b9e6ef61d9bcfa0.jpg"
+                         style="height: 100px;width: 150px">
+                    水果头像由<a href="https://coding.net">coding.net</a>提供。
+                </div>
+                <div class="form-group left">
+                    <button id="save_avatar" type="submit" class="btn btn-primary">保存</button>
+                </div>
+
+            </div>
         </div>
     </div>
-    <div class="col-lg-6">
-        <form>
-            <div class="row">
-                {% for i in "aaaaaaaaaaaaaaaaaaaa" %}
-                <div class="col-lg-2 avatar-item">
-                    <div style="border: 1px solid red;">
-                        <img src="/static/img/avatar/avatar-{{ forloop.counter }}.png">
-                    </div>
-                </div>
-                {% endfor %}
-
-            </div>
-
-            <div title="Coding.net 是深圳市扣钉网络科技有限公司打造的国内最大的一站式云端开发平台，提供包括代码托管，项目管理，产品演示，WebIDE 等工具。">
-                <img src="https://coding.net/static/d0aa9dd75e2500930b9e6ef61d9bcfa0.jpg"
-                     style="height: 100px;width: 150px">
-                水果头像由<a href="https://coding.net">coding.net</a>提供。
-            </div>
-
-        </form>
-    </div>
-</div>
 {% endblock %}
 
 {% block js_block %}
-<script src="/static/js/app/oj/account/avatar.js"></script>
+    <script src="/static/js/app/oj/account/avatar.js"></script>
 {% endblock %}
diff --git a/template/src/oj/account/settings.html b/template/src/oj/account/settings.html
index 3dc75c6d..ebfee385 100644
--- a/template/src/oj/account/settings.html
+++ b/template/src/oj/account/settings.html
@@ -36,7 +36,7 @@
                 <div class="form-group col-md-6"><label>手机</label>
                     <input name="phone" type="text" maxlength="11" id="phone"
                            class="form-control"
-                           value="{{ request.user.userprofile.phone_number }}">
+                           value="{% if request.user.userprofile.phone_number %}{{ request.user.userprofile.phone_number }}{% endif %}">
                 </div>
                 <div class="help-block with-errors"></div>
             </div>
@@ -44,7 +44,7 @@
                 <div class="form-group col-md-6">
                     <label>学校</label>
                     <input name="school" type="text" class="form-control" id="school"
-                           value="{{ request.user.userprofile.school }}">
+                           value="{% if request.user.userprofile.school %}{{ request.user.userprofile.school }}{% endif %}">
 
                     <div class="help-block with-errors"></div>
                 </div>